Py2/3-safe checkspecs

Author: effigies

tools/checkspecs.py

@@ -155,6 +155,22 @@ def _parse_lines(self, linesource, module):
         classes.sort()
         return functions, classes
 
+    @classmethod
+    def _normalize_repr(cls, value):
+        if isinstance(value, list):
+            return '[{}]'.format(', '.join(map(cls._normalize_repr, value)))
+        if isinstance(value, tuple):
+            if len(value) == 1:
+                return '({},)'.format(cls._normalize_repr(value[0]))
+            return '({})'.format(', '.join(map(cls._normalize_repr, value)))
+        if isinstance(value, (str, bytes)):
+            value = repr(value)
+            if value[0] not in ('"', "'"):
+                value = value[1:]
+        else:
+            value = repr(value)
+        return value
+
     def test_specs(self, uri):
         """Check input and output specs in an uri
 
@@ -206,6 +222,7 @@ def test_specs(self, uri):
             if not os.path.exists(nonautotest):
                 with open(testfile, 'wt') as fp:
                     cmd = ['# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT',
+                           'from __future__ import unicode_literals',
                            'from ..%s import %s' % (uri.split('.')[-1], c),
                            '']
                     cmd.append('\ndef test_%s_inputs():' % c)
@@ -215,14 +232,7 @@ def test_specs(self, uri):
                         for key, value in sorted(trait.__dict__.items()):
                             if key in in_built or key == 'desc':
                                 continue
-                            if isinstance(value, (str, bytes)):
-                                quote = "'"
-                                if "'" in value:
-                                    quote = '"'
-                                input_fields += "%s=%s%s%s,\n    " % (key, quote,
-                                                                      value, quote)
-                            else:
-                                input_fields += "%s=%s,\n    " % (key, value)
+                            input_fields += "%s=%s,\n    " % (key, self._normalize_repr(value))
                         input_fields += '),\n    '
                     cmd += ['    input_map = dict(%s)' % input_fields]
                     cmd += ['    inputs = %s.input_spec()' % c]
@@ -259,14 +269,7 @@ def test_specs(self, uri):
                         for key, value in sorted(trait.__dict__.items()):
                             if key in in_built or key == 'desc':
                                 continue
-                            if isinstance(value, (str, bytes)):
-                                quote = "'"
-                                if "'" in value:
-                                    quote = '"'
-                                input_fields += "%s=%s%s%s,\n    " % (key, quote,
-                                                                      value, quote)
-                            else:
-                                input_fields += "%s=%s,\n    " % (key, value)
+                            input_fields += "%s=%s,\n    " % (key, self._normalize_repr(value))
                         input_fields += '),\n    '
                     cmd += ['    output_map = dict(%s)' % input_fields]
                     cmd += ['    outputs = %s.output_spec()' % c]