Remove scancode references in temp dir names #2233

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

src/extractcode/archive.py

@@ -332,7 +332,7 @@ def extract_twice(location, target_dir, extractor1, extractor2):
     abs_location = os.path.abspath(os.path.expanduser(location))
     abs_target_dir = compat.unicode(os.path.abspath(os.path.expanduser(target_dir)))
     # extract first the intermediate payload to a temp dir
-    temp_target = compat.unicode(fileutils.get_temp_dir(prefix='scancode-extract-'))
+    temp_target = compat.unicode(fileutils.get_temp_dir(prefix='extractcode-extract-'))
     warnings = extractor1(abs_location, temp_target)
     if TRACE:
         logger.debug('extract_twice: temp_target: %(temp_target)r' % locals())
@@ -366,15 +366,15 @@ def extract_with_fallback(location, target_dir, extractor1, extractor2):
     abs_location = os.path.abspath(os.path.expanduser(location))
     abs_target_dir = compat.unicode(os.path.abspath(os.path.expanduser(target_dir)))
     # attempt extract first to a temp dir
-    temp_target1 = compat.unicode(fileutils.get_temp_dir(prefix='scancode-extract1-'))
+    temp_target1 = compat.unicode(fileutils.get_temp_dir(prefix='extractcode-extract1-'))
     try:
         warnings = extractor1(abs_location, temp_target1)
         if TRACE:
             logger.debug('extract_with_fallback: temp_target1: %(temp_target1)r' % locals())
         fileutils.copytree(temp_target1, abs_target_dir)
     except:
         try:
-            temp_target2 = compat.unicode(fileutils.get_temp_dir(prefix='scancode-extract2-'))
+            temp_target2 = compat.unicode(fileutils.get_temp_dir(prefix='extractcode-extract2-'))
             warnings = extractor2(abs_location, temp_target2)
             if TRACE:
                 logger.debug('extract_with_fallback: temp_target2: %(temp_target2)r' % locals())
@@ -396,7 +396,7 @@ def try_to_extract(location, target_dir, extractor):
     """
     abs_location = os.path.abspath(os.path.expanduser(location))
     abs_target_dir = compat.unicode(os.path.abspath(os.path.expanduser(target_dir)))
-    temp_target = compat.unicode(fileutils.get_temp_dir(prefix='scancode-extract1-'))
+    temp_target = compat.unicode(fileutils.get_temp_dir(prefix='extractcode-extract1-'))
     warnings = []
     try:
         warnings = extractor(abs_location, temp_target)

src/extractcode/extract.py

@@ -243,7 +243,7 @@ def extract_file(
         try:
             # extract first to a temp directory: if there is an error,  the
             # extracted files will not be moved to target
-            tmp_tgt = fileutils.get_temp_dir(prefix='scancode-extract-')
+            tmp_tgt = fileutils.get_temp_dir(prefix='extractcode-extract-')
             abs_location = abspath(expanduser(location))
             warns = extractor(abs_location, tmp_tgt) or []
             warnings.extend(warns)

src/extractcode/sevenzip.py

@@ -50,9 +50,10 @@
 from extractcode import ExtractWarningIncorrectEntry
 
 if py3:
-    from shlex import quote as shlex_quote
+    from shlex import quote as shlex_quote  # NOQA
 else:
-    from pipes import quote as shlex_quote
+    from pipes import quote as shlex_quote  # NOQA
+
 
 """
 Low level support for p/7zip-based archive extraction.
@@ -375,7 +376,7 @@ def extract_file_by_file(location, target_dir, arch_type='*', skip_symlinks=True
 
     errors = {}
     warnings = {}
-    tmp_dir = fileutils.get_temp_dir(prefix='scancode-7zip-')
+    tmp_dir = fileutils.get_temp_dir(prefix='extractcode-extract-')
     for i, entry in enumerate(entries):
 
         if not entry.is_file:
@@ -617,7 +618,7 @@ def parse_7z_listing(location, utf=False):
             second_line = lines.pop(1)
             first_line = line_sep.join([first_line, second_line])
             lines[0] = first_line
-        
+
         dangling_lines = [line  for line in lines if kv_sep not in line]
         entry_errors = []
         if dangling_lines:
@@ -673,7 +674,7 @@ class Entry(object):
 
     def to_dict(self, full=False):
         data = attr.asdict(self)
-        #data.pop('errors', None)
+        # data.pop('errors', None)
         if not full:
             data.pop('date', None)
         return data

src/extractcode/uncompress.py

@@ -86,7 +86,7 @@ def uncompress_file(location, decompressor):
 
     warnings = []
     base_name = fileutils.file_base_name(location)
-    target_location = os.path.join(fileutils.get_temp_dir(prefix='scancode-extract-'), base_name)
+    target_location = os.path.join(fileutils.get_temp_dir(prefix='extractcode-extract-'), base_name)
     with decompressor(location, 'rb') as compressed:
         with open(target_location, 'wb') as uncompressed:
             buffer_size = 32 * 1024 * 1024