More Py3 string fixes.

Kannan Goundan · braincore · commit 3675b88d32f2 · 2016-05-20T10:51:13.000-07:00
Reviewed By: guido
diff --git a/babelapi/babel/parser.py b/babelapi/babel/parser.py
@@ -201,7 +201,7 @@ class BabelParser(object):
     tokens = BabelLexer.tokens
 
     # Ply feature: Starting grammar rule
-    start = 'spec'
+    start = str('spec')  # PLY wants a 'str' instance; this makes it work in Python 2 and 3
 
     def __init__(self, debug=False):
         self.debug = debug
diff --git a/babelapi/generator.py b/babelapi/generator.py
@@ -128,7 +128,7 @@ def emit(self, s=''):
         output buffer. If s is an empty string (default) then an empty line is
         created with no indentation.
         """
-        assert isinstance(s, six.text_type), 's must be a string type'
+        assert isinstance(s, six.text_type), 's must be a unicode string'
         assert '\n' not in s, \
             'String to emit cannot contain newline strings.'
         if s:
@@ -243,7 +243,7 @@ def generate_multiline_list(self, items, before='', after='',
                 should have a trailing separator. Ignored when compact is true.
         """
         assert len(delim) == 2 and isinstance(delim[0], six.text_type) and \
-            isinstance(delim[1], six.text_type), 'delim must be a tuple of two strings.'
+            isinstance(delim[1], six.text_type), 'delim must be a tuple of two unicode strings.'
 
         if len(items) == 0:
             self.emit(before + delim[0] + delim[1] + after)
@@ -301,7 +301,7 @@ def block(self, before='', after='', delim=('{','}'), dent=None):
                 indentation increment is used (four spaces or one tab).
         """
         assert len(delim) == 2 and isinstance(delim[0], six.text_type) and \
-            isinstance(delim[1], six.text_type), 'delim must be a tuple of two strings.'
+            isinstance(delim[1], six.text_type), 'delim must be a tuple of two unicode strings.'
 
         if before:
             self.emit('{} {}'.format(before, delim[0]))
diff --git a/example/generator/unbabel/unbabel.babelg.py b/example/generator/unbabel/unbabel.babelg.py
@@ -7,6 +7,9 @@
 - Aliases are lost (they are expanded in-line)
 - Docstrings are reformatted
 """
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+import six
 
 from babelapi.babel.parser import BabelTypeRef
 from babelapi.data_type import DataType, _BoundedInteger, _BoundedFloat
@@ -132,10 +135,10 @@ def format_data_type(self, data_type):
 
     def format_value(self, val):
         """Helper function to format a value."""
-        if isinstance(val, str):
+        if isinstance(val, six.text_type):
             return self.format_string(val)
         else:
-            return str(val)
+            return six.text_type(val)
 
     def format_string(self, val):
         """Helper function to format a string."""
diff --git a/generator/python/python.babelg.py b/generator/python/python.babelg.py
@@ -2,6 +2,8 @@
 Code generator for Python.
 """
 
+from __future__ import absolute_import, division, print_function, unicode_literals
+
 import os
 import re
 import shutil
diff --git a/generator/python/test_python_gen.py b/generator/python/test_python_gen.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
+
 import base64
 import datetime
 import imp
diff --git a/generator/swift/swift.babelg.py b/generator/swift/swift.babelg.py
@@ -1,5 +1,8 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
+
 import os
 import shutil
+import six
 
 from contextlib import contextmanager
 
@@ -103,7 +106,7 @@ def class_block(self, thing, protocols=None):
             name = self.class_data_type(thing)
             if thing.supertype:
                 extensions.append(self.class_data_type(thing.supertype))
-        elif isinstance(thing, basestring):
+        elif isinstance(thing, six.text_type):
             name = thing
         else:
             raise TypeError("trying to generate class block for unknown type %r" % thing)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import absolute_import, division, print_function, unicode_literals`
	`2`	`+`
`1`	`3`	`import base64`
`2`	`4`	`import datetime`
`3`	`5`	`import imp`