Delete code only needed on python 2.5 and earlier

Author: njsmith

patsy/compat.py

@@ -34,73 +34,6 @@ def diag_indices(n):
 # add here explaining their provenance, any changes made, and what versions of
 # Python require them:
 
-# Copied unchanged from Python 2.7.3's re.py module; all I did was add the
-# import statements at the top.
-# This code seems to be included in Python 2.5+.
-import re
-if optional_dep_ok and hasattr(re, "Scanner"):
-    Scanner = re.Scanner
-else:
-    import sre_parse
-    import sre_compile
-    class Scanner:
-        def __init__(self, lexicon, flags=0):
-            from sre_constants import BRANCH, SUBPATTERN
-            self.lexicon = lexicon
-            # combine phrases into a compound pattern
-            p = []
-            s = sre_parse.Pattern()
-            s.flags = flags
-            for phrase, action in lexicon:
-                p.append(sre_parse.SubPattern(s, [
-                    (SUBPATTERN, (len(p)+1, sre_parse.parse(phrase, flags))),
-                    ]))
-            s.groups = len(p)+1
-            p = sre_parse.SubPattern(s, [(BRANCH, (None, p))])
-            self.scanner = sre_compile.compile(p)
-        def scan(self, string):
-            result = []
-            append = result.append
-            match = self.scanner.scanner(string).match
-            i = 0
-            while 1:
-                m = match()
-                if not m:
-                    break
-                j = m.end()
-                if i == j:
-                    break
-                action = self.lexicon[m.lastindex-1][1]
-                if hasattr(action, '__call__'):
-                    self.match = m
-                    action = action(self, m.group())
-                if action is not None:
-                    append(action)
-                i = j
-            return result, string[i:]
-
-# functools available in Python 2.5+
-# This is just a cosmetic thing, so don't bother emulating it if we don't
-# have it.
-def compat_wraps(f1):
-    def do_wrap(f2):
-        return f2
-    return do_wrap
-if optional_dep_ok:
-    try:
-        from functools import wraps
-    except ImportError:
-        wraps = compat_wraps
-else:
-    wraps = compat_wraps
-
-# collections.Mapping available in Python 2.6+
-import collections
-if optional_dep_ok and hasattr(collections, "Mapping"):
-    Mapping = collections.Mapping
-else:
-    Mapping = dict
-
 # OrderedDict is only available in Python 2.7+. compat_ordereddict.py has
 # comments at the top.
 import collections

patsy/constraint.py

@@ -10,6 +10,7 @@
 __all__ = ["LinearConstraint"]
 
 import re
+from collections import Mapping
 import six
 import numpy as np
 from patsy import PatsyError
@@ -19,7 +20,6 @@
                         SortAnythingKey,
                         no_pickling, assert_no_pickling)
 from patsy.infix_parser import Token, Operator, ParseNode, infix_parse
-from patsy.compat import Scanner, Mapping
 
 class LinearConstraint(object):
     """A linear constraint in matrix form.
@@ -176,7 +176,7 @@ def _tokenize_constraint(string, variable_names):
         (whitespace_re, None),
         ]
 
-    scanner = Scanner(lexicon)
+    scanner = re.Scanner(lexicon)
     tokens, leftover = scanner.scan(string)
     if leftover:
         offset = len(string) - len(leftover)

patsy/state.py

@@ -24,12 +24,12 @@
 # because right now I'm not sure how to tell whether we are being called for
 # fitting versus being called for prediction.
 
+from functools import wraps
 import numpy as np
 from patsy.util import (atleast_2d_column_default,
                         asarray_or_pandas, pandas_friendly_reshape,
                         wide_dtype_for, safe_issubdtype,
                         no_pickling, assert_no_pickling)
-from patsy.compat import wraps
 
 # These are made available in the patsy.* namespace
 __all__ = ["stateful_transform",