python 3.5

- Add Python 3.5 compatibility
- Fix sorting in test

Author: jelu

debian/control

@@ -2,13 +2,13 @@ Source: dsc-datatool
 Section: python
 Priority: optional
 Maintainer: Jerry Lundström <lundstrom.jerry@gmail.com>
-Build-Depends: debhelper (>= 8.0.0), python3 (>= 3.6), python3-maxminddb,
+Build-Depends: debhelper (>= 8.0.0), python3 (>= 3.5), python3-maxminddb,
  python3-yaml, python3-setuptools, dh-python
 Standards-Version: 3.9.4
 Homepage: https://www.dns-oarc.net/oarc/data/dsc
 Vcs-Git: https://github.com/DNS-OARC/dsc-datatool.git
 Vcs-Browser: https://github.com/DNS-OARC/dsc-datatool
-X-Python3-Version: >= 3.6
+X-Python3-Version: >= 3.5
 
 Package: dsc-datatool
 Architecture: all

dsc_datatool/generator/client_subnet_authority.py

@@ -162,3 +162,8 @@ def process(self, datasets):
                 authd.dimensions.append(authd1)
 
         return gen_datasets
+
+
+import sys
+if sys.version_info[0] == 3 and sys.version_info[1] == 5:
+    Generator.__init_subclass__(client_subnet_authority)

dsc_datatool/generator/client_subnet_country.py

@@ -91,3 +91,8 @@ def process(self, datasets):
                 ccd.dimensions.append(ccd1)
 
         return gen_datasets
+
+
+import sys
+if sys.version_info[0] == 3 and sys.version_info[1] == 5:
+    Generator.__init_subclass__(client_subnet_country)

dsc_datatool/input/dat.py

@@ -170,3 +170,8 @@ def process3d(self, file, name, first, second):
                 datasets.append(dataset)
 
         return datasets
+
+
+import sys
+if sys.version_info[0] == 3 and sys.version_info[1] == 5:
+    Input.__init_subclass__(DAT)

dsc_datatool/input/xml.py

@@ -52,3 +52,8 @@ def process(self, file):
             datasets.append(dataset)
 
         return datasets
+
+
+import sys
+if sys.version_info[0] == 3 and sys.version_info[1] == 5:
+    Input.__init_subclass__(XML)

dsc_datatool/output/influxdb.py

@@ -97,3 +97,7 @@ def process(self, datasets):
 
             for d in dataset.dimensions:
                 _process(tags, timestamp, d, self.fh)
+
+
+if sys.version_info[0] == 3 and sys.version_info[1] == 5:
+    Output.__init_subclass__(InfluxDB)

dsc_datatool/transformer/labler.py

@@ -62,3 +62,8 @@ def process(self, datasets):
 
             for d in dataset.dimensions:
                 _process(label, d)
+
+
+import sys
+if sys.version_info[0] == 3 and sys.version_info[1] == 5:
+    Transformer.__init_subclass__(Labler)

dsc_datatool/transformer/net_remap.py

@@ -70,3 +70,8 @@ def process(self, datasets):
         for dataset in datasets:
             for dimension in dataset.dimensions:
                 self._process(dimension)
+
+
+import sys
+if sys.version_info[0] == 3 and sys.version_info[1] == 5:
+    Transformer.__init_subclass__(NetRemap)

dsc_datatool/transformer/re_ranger.py

@@ -116,3 +116,8 @@ def process(self, datasets):
         for dataset in datasets:
             for dimension in dataset.dimensions:
                 self._process(dimension)
+
+
+import sys
+if sys.version_info[0] == 3 and sys.version_info[1] == 5:
+    Transformer.__init_subclass__(ReRanger)

setup.py

@@ -6,10 +6,10 @@
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
-    python_requires='>=3.6.8',
+    python_requires='>=3.5.1',
     install_requires=[
-        'maxminddb>=1.3.0',
-        'PyYAML>=3.12',
+        'maxminddb>=1.2.0',
+        'PyYAML>=3.11',
     ],
     extras_require={
         'dev': [