From 71af186659923dfe8721c551d5dbf4db7c4854d9 Mon Sep 17 00:00:00 2001
From: Andi Albrecht <albrecht.andi@gmail.com>
Date: Sat, 17 Jan 2015 12:47:03 +0100
Subject: Remove six dependency.

We only use very little of six. That isn't worth to add an extra
dependency.
---
 sqlparse/sql.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'sqlparse/sql.py')

diff --git a/sqlparse/sql.py b/sqlparse/sql.py
index f3a4820..17509eb 100644
--- a/sqlparse/sql.py
+++ b/sqlparse/sql.py
@@ -5,8 +5,7 @@
 import re
 import sys
 
-import six
-
+from sqlparse import compat
 from sqlparse import tokens as T
 
 
@@ -34,7 +33,7 @@ class Token(object):
         if sys.version_info[0] == 3:
             return self.value
         else:
-            return six.text_type(self).encode('utf-8')
+            return compat.text_type(self).encode('utf-8')
 
     def __repr__(self):
         short = self._get_repr_value()
@@ -53,15 +52,15 @@ class Token(object):
         .. deprecated:: 0.1.5
            Use ``unicode(token)`` (for Python 3: ``str(token)``) instead.
         """
-        return six.text_type(self)
+        return compat.text_type(self)
 
     def _get_repr_name(self):
         return str(self.ttype).split('.')[-1]
 
     def _get_repr_value(self):
-        raw = six.text_type(self)
+        raw = compat.text_type(self)
         if len(raw) > 7:
-            raw = raw[:6] + six.text_type('...')
+            raw = raw[:6] + compat.text_type('...')
         return re.sub('\s+', ' ', raw)
 
     def flatten(self):
@@ -85,7 +84,7 @@ class Token(object):
             return type_matched
 
         if regex:
-            if isinstance(values, six.string_types):
+            if isinstance(values, compat.string_types):
                 values = set([values])
 
             if self.ttype is T.Keyword:
@@ -98,7 +97,7 @@ class Token(object):
                     return True
             return False
 
-        if isinstance(values, six.string_types):
+        if isinstance(values, compat.string_types):
             if self.is_keyword:
                 return values.upper() == self.normalized
             return values == self.value
@@ -174,7 +173,7 @@ class TokenList(Token):
         if sys.version_info[0] == 3:
             return ''.join(x.value for x in self.flatten())
         else:
-            return ''.join(six.text_type(x) for x in self.flatten())
+            return ''.join(compat.text_type(x) for x in self.flatten())
 
     def _get_repr_name(self):
         return self.__class__.__name__
@@ -398,7 +397,7 @@ class TokenList(Token):
             alias = next_
         if isinstance(alias, Identifier):
             return alias.get_name()
-        return self._remove_quotes(six.text_type(alias))
+        return self._remove_quotes(compat.text_type(alias))
 
     def get_name(self):
         """Returns the name of this identifier.
@@ -487,7 +486,7 @@ class Identifier(TokenList):
         next_ = self.token_next(self.token_index(marker), False)
         if next_ is None:
             return None
-        return six.text_type(next_)
+        return compat.text_type(next_)
 
     def get_ordering(self):
         """Returns the ordering or ``None`` as uppercase string."""
-- 
cgit v1.2.1