From 1c57c0332ece1852fdd9ec04c856652afc17febc Mon Sep 17 00:00:00 2001
From: dave <dave@davepedu.com>
Date: Sat, 4 May 2019 21:34:18 -0700
Subject: [PATCH] support xz

---
 pydpkg/__init__.py | 29 +++++++++++++++++++++--------
 setup.py           | 13 +++++++------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/pydpkg/__init__.py b/pydpkg/__init__.py
index dd7c147..6ea5097 100644
--- a/pydpkg/__init__.py
+++ b/pydpkg/__init__.py
@@ -14,6 +14,7 @@ import tarfile
 
 from collections import defaultdict
 from gzip import GzipFile
+import lzma
 from email import message_from_string, message_from_file
 from functools import cmp_to_key
 
@@ -24,6 +25,13 @@ from arpy import Archive
 
 REQUIRED_HEADERS = ('package', 'version', 'architecture')
 
+
+control_openers = {
+    'gz': lambda fob: GzipFile(fileobj=fob),
+    'xz': lambda fob: lzma.open(fob, "r")
+}
+
+
 logging.basicConfig()
 
 
@@ -47,7 +55,7 @@ class DpkgMissingControlFile(DpkgError):
     pass
 
 
-class DpkgMissingControlGzipFile(DpkgError):
+class DpkgMissingControlArchive(DpkgError):
     """No control.tar.gz file found in dpkg file"""
     pass
 
@@ -288,16 +296,21 @@ class Dpkg(object):
     def _process_dpkg_file(self, filename):
         dpkg_archive = Archive(filename)
         dpkg_archive.read_all_headers()
-        try:
-            control_tgz = dpkg_archive.archived_files[b'control.tar.gz']
-        except KeyError:
-            raise DpkgMissingControlGzipFile(
-                'Corrupt dpkg file: no control.tar.gz file in ar archive.')
+        control_opener = None
+        control_tgz = None
+        for ext, opener in control_openers.items():
+            control_name = b''.join([b'control.tar.', ext.encode()])
+            if control_name in dpkg_archive.archived_files:
+                control_tgz = dpkg_archive.archived_files[control_name]
+                control_opener = opener
+                break
+        if not control_tgz:
+            raise DpkgMissingControlArchive(
+                'Corrupt dpkg file: no control file archive in ar archive.')
         self._log.debug('found controlgz: %s', control_tgz)
-
         # have to pass through BytesIO because gzipfile doesn't support seek
         # from end; luckily control tars are tiny
-        with GzipFile(fileobj=control_tgz) as gzf:
+        with control_opener(control_tgz) as gzf:
             self._log.debug('opened gzip file: %s', gzf)
             with tarfile.open(fileobj=io.BytesIO(gzf.read())) as control_tar:
                 self._log.debug('opened tar file: %s', control_tar)
diff --git a/setup.py b/setup.py
index 0b26c3d..018ab50 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,8 @@
-from distutils.core import setup
+from setuptools import setup
+
+
+__VERSION__ = '1.3.2'
 
-__VERSION__ = '1.3.1'
 
 setup(
     name='pydpkg',
@@ -12,9 +14,9 @@ setup(
     url='https://github.com/theclimatecorporation/python-dpkg',
     download_url='https://github.com/theclimatecorporation/python-dpkg/tarball/%s' % __VERSION__,
     keywords=['apt', 'debian', 'dpkg', 'packaging'],
-    install_requires=[
+    setup_requires=[
         'arpy==1.1.1',
-        'six==1.10.0',
+        'six>=1.10.0',
         'PGPy==0.4.1'
     ],
     extras_require={
@@ -31,6 +33,5 @@ setup(
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: Implementation :: CPython",
-        "Topic :: System :: Archiving :: Packaging",
-        ]
+        "Topic :: System :: Archiving :: Packaging"]
 )