Merge pull request #404 from mpsonntag/py2bgone

Dropping Python 2 support

Author: jgrewe

.travis.yml

@@ -10,8 +10,6 @@ matrix:
       dist: bionic
 
   include:
-    - os: linux
-      python: "2.7"
     - os: linux
       python: "3.5"
     - os: linux
@@ -27,10 +25,6 @@ matrix:
       python: "3.9-dev"
       dist: bionic
 
-    - os: osx
-      language: generic
-      env:
-        - OSXENV=2.7.14
     - os: osx
       language: generic
       env:

CHANGELOG.md

@@ -3,6 +3,16 @@
 Used to document all changes from previous releases and collect changes 
 until the next release.
 
+# Latest
+
+# Dropping Python 2 support
+
+Python 2 has reached end of life. The codebase has been cleaned from Python 2 and Python 3 compatible code, all tests now run exclusively on Python 3 versions.
+
+# Features
+- `odml.save` and `odmlparser.ODMLWriter` now support additional keywords. See issue #402 and PR #403 for details.
+
+
 # Version 1.5.1
 
 # RDF Subclassing feature

appveyor.yml

@@ -4,9 +4,6 @@ image: Visual Studio 2017
 
 environment:
   matrix:
-    - PYTHON: "C:\\Python27"
-      PYVER: 2
-      BITS: 32
     - PYTHON: "C:\\Python36"
       PYVER: 3
       BITS: 32
@@ -16,9 +13,6 @@ environment:
     - PYTHON: "C:\\Python38"
       PYVER: 3
       BITS: 32
-    - PYTHON: "C:\\Python27-x64"
-      PYVER: 2
-      BITS: 64
     - PYTHON: "C:\\Python36-x64"
       PYVER: 3
       BITS: 64

odml/dtypes.py

@@ -10,11 +10,6 @@
 
 self = sys.modules[__name__].__dict__
 
-try:
-    unicode = unicode
-except NameError:
-    unicode = str
-
 FORMAT_DATE = "%Y-%m-%d"
 FORMAT_DATETIME = "%Y-%m-%d %H:%M:%S"
 FORMAT_TIME = "%H:%M:%S"
@@ -103,7 +98,7 @@ def valid_type(dtype):
     if dtype is None:
         return True
 
-    if not isinstance(dtype, str) and not isinstance(dtype, unicode):
+    if not isinstance(dtype, str):
         return False
 
     dtype = dtype.lower()
@@ -152,14 +147,13 @@ def set(value, dtype=None):
     """
     if not dtype:
         return str_set(value)
+
     if dtype.endswith("-tuple"):
         return tuple_set(value)
-    if sys.version_info > (3, 0):
-        if isinstance(value, str):
-            return str_set(value)
-    else:
-        if isinstance(value, (str, unicode)):
-            return str_set(value)
+
+    if isinstance(value, str):
+        return str_set(value)
+
     return self.get(dtype + "_set", str_set)(value)
 
 
@@ -206,9 +200,6 @@ def str_get(string):
     if string in [None, "", [], {}]:
         return default_values("string")
 
-    if sys.version_info < (3, 0):
-        return unicode(string)
-
     return str(string)
 
 
@@ -296,7 +287,7 @@ def boolean_get(string):
     if string in [None, "", [], {}]:
         return default_values("boolean")
 
-    if isinstance(string, (unicode, str)):
+    if isinstance(string, str):
         string = string.lower()
 
     truth = ["true", "1", True, "t"]  # be kind, spec only accepts True / False

odml/format.py

@@ -3,8 +3,6 @@
 XML and RDF attributes to their Python class equivalents.
 """
 
-import sys
-
 from rdflib import Namespace
 
 import odml
@@ -76,12 +74,8 @@ def revmap(self, name):
         if self._rev_map is None:
             # create the reverse map only if requested
             self._rev_map = {}
-            if sys.version_info < (3, 0):
-                for k, val in self._map.iteritems():
-                    self._rev_map[val] = k
-            else:
-                for k, val in self._map.items():
-                    self._rev_map[val] = k
+            for k, val in self._map.items():
+                self._rev_map[val] = k
 
         return self._rev_map.get(name)
 

odml/property.py

@@ -29,11 +29,6 @@ def odml_tuple_import(t_count, new_value):
     :param new_value: string containing an odml style tuple list.
     :return: list of odml style tuples.
     """
-    try:
-        unicode = unicode
-    except NameError:
-        unicode = str
-
     if not isinstance(new_value, (list, tuple)) and \
             not isinstance(new_value[0], (list, tuple)):
         new_value = [new_value]
@@ -48,9 +43,6 @@ def odml_tuple_import(t_count, new_value):
                     n_val_str += str(tuple_val) + "; "
                 return_value += [n_val_str[:-2] + ")"]
         else:
-            #non-unicode handling needed for python2
-            if len(n_val) != 1 and not isinstance(n_val[0], unicode):
-                n_val = n_val.encode('utf-8')
             cln = n_val.strip()
             br_check = cln.count("(") == cln.count(")")
             sep_check = t_count == 1 or cln.count("(") == (cln.count(";") / (t_count - 1))

odml/scripts/odml_convert.py

@@ -37,11 +37,6 @@
 
 from odml.tools.converters import VersionConverter as VerConf
 
-try:
-    unicode = unicode
-except NameError:
-    unicode = str
-
 
 def run_conversion(file_list, output_dir, report, source_format="XML"):
     """
@@ -56,7 +51,7 @@ def run_conversion(file_list, output_dir, report, source_format="XML"):
     # Exceptions are kept as broad as possible to ignore any non-odML or
     # invalid odML files and ensuring everything that can be will be converted.
     for curr_file in file_list:
-        file_path = unicode(curr_file.absolute())
+        file_path = str(curr_file.absolute())
         report.write("[Info] Handling file '%s'\n" % file_path)
         # When loading the current file succeeds, it is
         # a recent odML format file and can be ignored.

odml/scripts/odml_to_rdf.py

@@ -39,11 +39,6 @@
 from odml.tools.odmlparser import ODMLReader, ODMLWriter
 from odml.tools.converters import VersionConverter as VerConf
 
-try:
-    unicode = unicode
-except NameError:
-    unicode = str
-
 
 def run_rdf_export(odml_file, export_dir):
     """
@@ -75,7 +70,7 @@ def run_conversion(file_list, output_dir, rdf_dir, report, source_format="XML"):
     # Exceptions are kept as broad as possible to ignore any non-odML or
     # invalid odML files and ensuring everything that can be will be converted.
     for curr_file in file_list:
-        file_path = unicode(curr_file.absolute())
+        file_path = str(curr_file.absolute())
         report.write("[Info] Handling file '%s'\n" % file_path)
         # When loading the current file succeeds, it is
         # a recent odML format file and can be exported

odml/templates.py

@@ -3,7 +3,6 @@
 """
 
 import os
-import sys
 import tempfile
 import threading
 try:
@@ -65,8 +64,7 @@ def cache_load(url):
             dati.fromtimestamp(os.path.getmtime(cache_file)) < (dati.now() - CACHE_AGE):
         try:
             data = urllib2.urlopen(url).read()
-            if sys.version_info.major > 2:
-                data = data.decode("utf-8")
+            data = data.decode("utf-8")
         except (ValueError, URLError) as exc:
             msg = "Failed to load resource from '%s': %s" % (url, exc)
             exc.args = (msg,)  # needs to be a tuple

odml/terminology.py

@@ -4,7 +4,6 @@
 
 import datetime
 import os
-import sys
 import tempfile
 import threading
 try:
@@ -47,8 +46,7 @@ def cache_load(url, replace_file=False):
             datetime.datetime.now() - CACHE_AGE:
         try:
             data = urllib2.urlopen(url).read()
-            if sys.version_info.major > 2:
-                data = data.decode("utf-8")
+            data = data.decode("utf-8")
         except Exception as exc:
             print("failed loading '%s': %s" % (url, exc))
             return