Remove py2 dependent decode if clauses

Author: mpsonntag

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

odml/tools/converters/version_converter.py

@@ -6,7 +6,6 @@
 import io
 import json
 import os
-import sys
 import uuid
 import yaml
 

odml/tools/odmlparser.py

@@ -6,7 +6,6 @@
 
 import datetime
 import json
-import sys
 import warnings
 
 from os.path import basename