Ensure extraction still works on Python 2.7

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

Author: pombredanne

src/extractcode/sevenzip.py

@@ -34,7 +34,6 @@
 import pprint
 import re
 from re import MULTILINE  # NOQA
-import shlex
 
 import attr
 
@@ -52,10 +51,17 @@
 from extractcode import ExtractErrorFailedToExtract
 from extractcode import ExtractWarningIncorrectEntry
 
+if py3:
+    from shlex import quote as shlex_quote
+else:
+    from pipes import quote as shlex_quote
+
+
 """
 Low level support for p/7zip-based archive extraction.
 """
 
+
 logger = logging.getLogger(__name__)
 
 TRACE = False
@@ -304,7 +310,7 @@ def build_7z_extract_command(
     ]
 
     if single_entry:
-        args += [shlex.quote(single_entry.path)]
+        args += [shlex_quote(single_entry.path)]
 
     lib_dir, cmd_loc = get_bin_locations()
 
@@ -675,7 +681,13 @@ def parse_7z_listing(location, utf=False):
 
         lines = path_block.splitlines(False)
         # thfirst line is the Path line
-        path = lines.pop(0).strip()
+        path_line = lines.pop(0).strip()
+        if 'Path =' in path_line:
+            _, _, path= path_line.partition('Path =')
+            path = path.lstrip()
+        else:
+            path = path_line
+
         second = lines[0]
 
         if equal_sep not in second:

tests/extractcode/test_sevenzip.py

@@ -50,15 +50,18 @@ def check_results_with_expected_json(self, results, expected_loc, regen=False):
             with open(expected_loc, wmode) as ex:
                 json.dump(results, ex, indent=2, separators=(',', ':'))
 
-        oph = OrderedDict if py2 else dict
+        # oph = OrderedDict if py2 else dict
 
         with open(expected_loc, 'rb') as ex:
-            expected = json.load(ex, encoding='utf-8', object_pairs_hook=oph)
+            expected = json.load(ex, encoding='utf-8', object_pairs_hook=dict)
 
         try:
             assert expected == results
         except AssertionError:
-            assert json.dumps(expected, indent=2) == json.dumps(results, indent=2)
+            if isinstance(results, dict):
+                expected = expected.items()
+                results = results.items()
+            assert json.dumps(sorted(expected), indent=2) == json.dumps(sorted(results), indent=2)
 
     def test_get_7z_errors_password_protected(self):
             test = '''