From e006e1689d5bb9ad614b5155e2ff17f7e51b83d8 Mon Sep 17 00:00:00 2001 From: Victor Uriarte Date: Tue, 10 May 2016 18:45:41 -0700 Subject: Update compat and utils --- sqlparse/compat.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'sqlparse/compat.py') diff --git a/sqlparse/compat.py b/sqlparse/compat.py index 6b26384..334883b 100644 --- a/sqlparse/compat.py +++ b/sqlparse/compat.py @@ -14,29 +14,40 @@ PY2 = sys.version_info[0] == 2 PY3 = sys.version_info[0] == 3 if PY3: + def u(s): + return str(s) + + + range = range text_type = str string_types = (str,) from io import StringIO - def u(s): - return str(s) elif PY2: + def u(s, encoding=None): + encoding = encoding or 'unicode-escape' + try: + return unicode(s) + except UnicodeDecodeError: + return unicode(s, encoding) + + + range = xrange text_type = unicode string_types = (basestring,) - from StringIO import StringIO # flake8: noqa - - def u(s): - return unicode(s) + from StringIO import StringIO # Directly copied from six: def with_metaclass(meta, *bases): """Create a base class with a metaclass.""" + # This requires a bit of explanation: the basic idea is to make a dummy # metaclass for one level of class instantiation that replaces itself with # the actual metaclass. class metaclass(meta): def __new__(cls, name, this_bases, d): return meta(name, bases, d) + return type.__new__(metaclass, 'temporary_class', (), {}) -- cgit v1.2.1