Move LazyReCompile to bpython.lazyre

sebastinas · sebastinas · commit cd46e2a61176 · 2015-02-02T22:56:16.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -34,6 +34,7 @@
 from bpython import importcompletion
 from bpython import line as lineparts
 from bpython._py3compat import py3
+from bpython.lazyre import LazyReCompile
 
 
 # Autocomplete modes
@@ -460,7 +461,7 @@ def safe_eval(expr, namespace):
         raise EvaluationError
 
 
-attr_matches_re = lineparts.LazyReCompile(r"(\w+(\.\w+)*)\.(\w*)")
+attr_matches_re = LazyReCompile(r"(\w+(\.\w+)*)\.(\w*)")
 
 
 def attr_matches(text, namespace):
diff --git a/bpython/curtsiesfrontend/parse.py b/bpython/curtsiesfrontend/parse.py
@@ -1,5 +1,5 @@
 
-from bpython.line import LazyReCompile
+from bpython.lazyre import LazyReCompile
 from bpython.formatter import BPythonFormatter
 from bpython._py3compat import PythonLexer
 from bpython.config import Struct, loadini, default_config_path
diff --git a/bpython/lazyre.py b/bpython/lazyre.py
@@ -0,0 +1,50 @@
+# The MIT License
+#
+# Copyright (c) 2015 the bpython authors.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+import re
+
+
+class LazyReCompile(object):
+
+    def __init__(self, regex, flags=0):
+        self.regex = regex
+        self.flags = flags
+        self.compiled = None
+
+    def compile_regex(method):
+        def _impl(self, *args, **kwargs):
+            if self.compiled is None:
+                self.compiled = re.compile(self.regex, self.flags)
+            return method(self, *args, **kwargs)
+        return _impl
+
+    @compile_regex
+    def finditer(self, *args, **kwargs):
+        return self.compiled.finditer(*args, **kwargs)
+
+    @compile_regex
+    def search(self, *args, **kwargs):
+        return self.compiled.search(*args, **kwargs)
+
+    @compile_regex
+    def match(self, *args, **kwargs):
+        return self.compiled.match(*args, **kwargs)
diff --git a/bpython/line.py b/bpython/line.py
@@ -4,35 +4,8 @@
 Python code, and return None, or a tuple of the start index, end index, and the
 word."""
 
-import re
 from itertools import chain
-
-
-class LazyReCompile(object):
-
-    def __init__(self, regex, flags=0):
-        self.regex = regex
-        self.flags = flags
-        self.compiled = None
-
-    def compile_regex(method):
-        def _impl(self, *args, **kwargs):
-            if self.compiled is None:
-                self.compiled = re.compile(self.regex, self.flags)
-            return method(self, *args, **kwargs)
-        return _impl
-
-    @compile_regex
-    def finditer(self, *args, **kwargs):
-        return self.compiled.finditer(*args, **kwargs)
-
-    @compile_regex
-    def search(self, *args, **kwargs):
-        return self.compiled.search(*args, **kwargs)
-
-    @compile_regex
-    def match(self, *args, **kwargs):
-        return self.compiled.match(*args, **kwargs)
+from bpython.lazyre import LazyReCompile
 
 
 current_word_re = LazyReCompile(r'[\w_][\w0-9._]*[(]?')
