use py2/py3 type Text instead of unicode

Author: mr-c

Makefile

@@ -160,7 +160,7 @@ mypy2: ${PYSOURCES}
 	rm -Rf typeshed/2and3/schema_salad
 	ln -s $(shell python -c 'from __future__ import print_function; import schema_salad; import os.path; print(os.path.dirname(schema_salad.__file__))') \
 		typeshed/2and3/schema_salad
-	MYPYPATH=$MYPYPATH:typeshed/2.7:typeshed/2and3 mypy --py2 --disallow-untyped-calls \
+	MYPYPATH=$$MYPYPATH:typeshed/2.7:typeshed/2and3 mypy --py2 --disallow-untyped-calls \
 		 --warn-redundant-casts \
 		 cwltool
 
@@ -171,7 +171,7 @@ mypy3: ${PYSOURCES}
 	rm -Rf typeshed/2and3/schema_salad
 	ln -s $(shell python3 -c 'from __future__ import print_function; import schema_salad; import os.path; print(os.path.dirname(schema_salad.__file__))') \
 		typeshed/2and3/schema_salad
-	MYPYPATH=$MYPYPATH:typeshed/3:typeshed/2and3 mypy --disallow-untyped-calls \
+	MYPYPATH=$$MYPYPATH:typeshed/3:typeshed/2and3 mypy --disallow-untyped-calls \
 		 --warn-redundant-casts \
 		 cwltool
 

cwltool/draft2tool.py

@@ -9,7 +9,8 @@
 import shutil
 import tempfile
 from functools import partial, cmp_to_key
-from typing import Any, Callable, Dict, Generator, List, Optional, Set, Text, Union, cast
+from typing import (Any, Callable, Dict, Generator, List, Optional, Set, Text,
+    Union, cast)
 
 from six import string_types, u
 
@@ -589,11 +590,11 @@ def collect_output(self, schema, builder, outdir, fs_access, compute_checksum=Tr
                                        "nameext": os.path.splitext(
                                            os.path.basename(g))[1],
                                        "class": "File" if fs_access.isfile(g)
-                                            else "Directory"}
+                                       else "Directory"}
                                       for g in sorted(fs_access.glob(
                                           fs_access.join(outdir, gb)),
                                           key=cmp_to_key(cast(
-                                              Callable[[unicode, unicode],
+                                              Callable[[Text, Text],
                                                   int], locale.strcoll)))])
                         except (OSError, IOError) as e:
                             _logger.warning(Text(e))

mypy.ini

@@ -1,2 +1,4 @@
+[mypy]
+
 [mypy-ruamel.*]
 ignore_errors = True