From 7e88aa243ed3356655b3a86da42e4d5dffb2bf10 Mon Sep 17 00:00:00 2001
From: Victor Uriarte <victor.m.uriarte@intel.com>
Date: Sat, 28 May 2016 17:28:54 -0700
Subject: Bid Adieu to metaclass

The singleton pattern isn't applicable since only one language is being
implemented.

Simplify Lexer initialization.

Fix compat func `u` on Py3. Signature didn't match Py2.
Feature isn't used yet.
---
 sqlparse/compat.py | 16 +--------------
 sqlparse/lexer.py  | 57 ++++++++++++++++--------------------------------------
 2 files changed, 18 insertions(+), 55 deletions(-)

(limited to 'sqlparse')

diff --git a/sqlparse/compat.py b/sqlparse/compat.py
index 334883b..84d0c96 100644
--- a/sqlparse/compat.py
+++ b/sqlparse/compat.py
@@ -14,7 +14,7 @@ PY2 = sys.version_info[0] == 2
 PY3 = sys.version_info[0] == 3
 
 if PY3:
-    def u(s):
+    def u(s, encoding=None):
         return str(s)
 
 
@@ -37,17 +37,3 @@ elif PY2:
     text_type = unicode
     string_types = (basestring,)
     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', (), {})
diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py
index 1bdc4c3..d7a8d28 100644
--- a/sqlparse/lexer.py
+++ b/sqlparse/lexer.py
@@ -17,48 +17,29 @@ import sys
 
 from sqlparse import tokens
 from sqlparse.keywords import SQL_REGEX
-from sqlparse.compat import StringIO, string_types, with_metaclass, text_type
+from sqlparse.compat import StringIO, string_types, text_type
 
 
-class LexerMeta(type):
-    """
-    Metaclass for Lexer, creates the self._tokens attribute from
-    self.tokens on the first instantiation.
-    """
-
-    def __call__(cls, *args):
-        if not hasattr(cls, '_tokens'):
-            cls._all_tokens = {}
-            processed = cls._all_tokens[cls.__name__] = {}
-
-            for state in SQL_REGEX:
-                processed[state] = []
-
-                for tdef in SQL_REGEX[state]:
-                    rex = re.compile(tdef[0], cls.flags).match
-
-                    if len(tdef) == 2:
-                        new_state = None
-                    else:
-                        # Only Multiline comments
-                        tdef2 = tdef[2]
-                        # an existing state
-                        if tdef2 == '#pop':
-                            new_state = -1
-                        elif tdef2 in SQL_REGEX:
-                            new_state = (tdef2,)
-                    processed[state].append((rex, tdef[1], new_state))
-            cls._tokens = processed
-        return type.__call__(cls, *args)
-
-
-class _Lexer(object):
-
+class Lexer(object):
     encoding = 'utf-8'
     flags = re.IGNORECASE | re.UNICODE
 
     def __init__(self):
-        self.filters = []
+        self._tokens = {}
+
+        for state in SQL_REGEX:
+            self._tokens[state] = []
+
+            for tdef in SQL_REGEX[state]:
+                rex = re.compile(tdef[0], self.flags).match
+                new_state = None
+                if len(tdef) > 2:
+                    # Only Multiline comments
+                    if tdef[2] == '#pop':
+                        new_state = -1
+                    elif tdef[2] in SQL_REGEX:
+                        new_state = (tdef[2],)
+                self._tokens[state].append((rex, tdef[1], new_state))
 
     def _decode(self, text):
         if sys.version_info[0] == 3:
@@ -170,10 +151,6 @@ class _Lexer(object):
                     break
 
 
-class Lexer(with_metaclass(LexerMeta, _Lexer)):
-    pass
-
-
 def tokenize(sql, encoding=None):
     """Tokenize sql.
 
-- 
cgit v1.2.1