Use compat module for single Python 2/3 code base.

This change includes minor fixes and code cleanup too.

1 files changed, 12 insertions, 11 deletions

diff --git a/sqlparse/sql.py b/sqlparse/sql.py
index 7325712..97dd24e 100644
--- a/sqlparse/sql.py
+++ b/sqlparse/sql.py
@@ -6,6 +6,7 @@ import re
 import sys
 
 from sqlparse import tokens as T
+from sqlparse.compat import string_types, u
 
 
 class Token(object):
@@ -32,7 +33,7 @@ class Token(object):
         if sys.version_info[0] == 3:
             return self.value
         else:
-            return unicode(self).encode('utf-8')
+            return u(self).encode('utf-8')
 
     def __repr__(self):
         short = self._get_repr_value()
@@ -51,13 +52,13 @@ class Token(object):
         .. deprecated:: 0.1.5
            Use ``unicode(token)`` (for Python 3: ``str(token)``) instead.
         """
-        return unicode(self)
+        return u(self)
 
     def _get_repr_name(self):
         return str(self.ttype).split('.')[-1]
 
     def _get_repr_value(self):
-        raw = unicode(self)
+        raw = u(self)
         if len(raw) > 7:
             raw = raw[:6] + u'...'
         return re.sub('\s+', ' ', raw)
@@ -83,7 +84,7 @@ class Token(object):
             return type_matched
 
         if regex:
-            if isinstance(values, basestring):
+            if isinstance(values, string_types):
                 values = set([values])
 
             if self.ttype is T.Keyword:
@@ -96,7 +97,7 @@ class Token(object):
                     return True
             return False
 
-        if isinstance(values, basestring):
+        if isinstance(values, string_types):
             if self.is_keyword:
                 return values.upper() == self.normalized
             return values == self.value
@@ -172,7 +173,7 @@ class TokenList(Token):
         if sys.version_info[0] == 3:
             return ''.join(x.value for x in self.flatten())
         else:
-            return ''.join(unicode(x) for x in self.flatten())
+            return ''.join(u(x) for x in self.flatten())
 
     def _get_repr_name(self):
         return self.__class__.__name__
@@ -185,9 +186,9 @@ class TokenList(Token):
                 pre = ' +-'
             else:
                 pre = ' | '
-            print '%s%s%d %s \'%s\'' % (indent, pre, idx,
+            print('%s%s%d %s \'%s\'' % (indent, pre, idx,
                                         token._get_repr_name(),
-                                        token._get_repr_value())
+                                        token._get_repr_value()))
             if (token.is_group() and (max_depth is None or depth < max_depth)):
                 token._pprint_tree(max_depth, depth + 1)
 
@@ -285,7 +286,7 @@ class TokenList(Token):
         if not isinstance(idx, int):
             idx = self.token_index(idx)
 
-        for n in xrange(idx, len(self.tokens)):
+        for n in range(idx, len(self.tokens)):
             token = self.tokens[n]
             if token.match(ttype, value, regex):
                 return token
@@ -349,7 +350,7 @@ class TokenList(Token):
             # Performing `index` manually is much faster when starting in the middle
             # of the list of tokens and expecting to find the token near to the starting
             # index.
-            for i in xrange(start, len(self.tokens)):
+            for i in range(start, len(self.tokens)):
                 if self.tokens[i] == token:
                     return i
             return -1
@@ -518,7 +519,7 @@ class Identifier(TokenList):
         next_ = self.token_next(self.token_index(marker), False)
         if next_ is None:
             return None
-        return unicode(next_)
+        return u(next_)
 
     def get_ordering(self):
         """Returns the ordering or ``None`` as uppercase string."""