Update changes; fix typing requirement

jdidion · Nov 19, 2017 · 6d2e39e · 6d2e39e
1 parent 465f5e2
commit 6d2e39e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,8 @@
-v3.1.2 (2017.11.18)
--------------------
+v3.1.3 (dev)
+------------
 
+v3.1.2 (2017.11.18)
+------------------- 
 * Added `xphyle.utils.uncompressed_size()`.
 
 v3.1.1 (2017.10.13)

diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
     # typing was added in 3.5, and we rely on critical features that were
     # introduced in 3.5.2+, so for versions older than 3.6 we rely on
     # a backport
-    install_requirements.append('backports.typing')
+    install_requirements.append('typing')
 
 import versioneer
 

diff --git a/xphyle/formats.py b/xphyle/formats.py
@@ -884,9 +884,7 @@ def get_list_command(self, path: str) -> List[str]:
         return [str(self.executable_path), '-l', path]
 
     def parse_file_listing(self, listing: str) -> Tuple[int, int, float]:
-        parsed = re.split(' +', listing.splitlines(keepends=False)[1])
-        if parsed[0] == '':
-            parsed = parsed[1:]
+        parsed = re.split(' +', listing.splitlines(keepends=False)[1].strip())
         if self.executable_name != 'pigz':
             parsed = parsed[5:8]
         ratio = float(parsed[2][:-1]) / 100
@@ -1075,7 +1073,7 @@ def parse_file_listing(self, listing: str) -> Tuple[int, int, float]:
         parsed = listing.splitlines(keepends=False)
         print(parsed)
         compressed, uncompressed = (
-            int(re.match('.+?(\d+) B\)?', size).group(1))
+            int(re.match(r'.+?(\d+) B\)?', size).group(1))
             for size in parsed[3:5])
         ratio = float(parsed[5][22:])
         return (compressed, uncompressed, ratio)