add Python 3 support

Author: mr-c

cwlupgrader/main.py

@@ -1,4 +1,6 @@
-from __future__ import print_function
+#!/usr/bin/env python
+
+from __future__ import print_function, unicode_literals
 import ruamel.yaml
 from typing import Any, Dict
 from collections import Mapping, Sequence
@@ -70,21 +72,21 @@ def setupCLTMappings(document):  # type: (Dict[unicode, Any]) -> None
 
 def shortenType(typeObj):
     # type: (List[Any]) -> Union[Unicode, List[Any]]
-    if isinstance(typeObj, (str, unicode)) or not isinstance(typeObj, Sequence):
+    if isinstance(typeObj, str) or not isinstance(typeObj, Sequence):
         return typeObj
     newType = []
     for entry in typeObj:  # find arrays that we can shorten and do so
         if isinstance(entry, Mapping):
             if (entry['type'] == 'array' and
-                    isinstance(entry['items'], (str, unicode))):
+                    isinstance(entry['items'], str)):
                 entry = entry['items'] + '[]'
         newType.extend([entry])
     typeObj = newType
     if len(typeObj) == 2:
         if 'null' in typeObj:
             typeCopy = copy.deepcopy(typeObj)
             typeCopy.remove('null')
-            if isinstance(typeCopy[0], (str, unicode)):
+            if isinstance(typeCopy[0], str):
                 return typeCopy[0] + '?'
     return typeObj
 

setup.py

@@ -10,7 +10,7 @@
 README = os.path.join(SETUP_DIR, 'README.rst')
 
 setup(name='cwl-upgrader',
-      version='0.2',
+      version='0.2.1',
       description='Common Workflow Language standalone document upgrader',
       long_description=open(README).read(),
       author='Common Workflow Language contributors',