fix bpython#473

thomasballinger · thomasballinger · commit 75b4a0f1c1d0 · 2015-02-07T10:33:11.000-05:00
diff --git a/bpython/curtsiesfrontend/preprocess.py b/bpython/curtsiesfrontend/preprocess.py
@@ -7,6 +7,7 @@
 
 
 indent_empty_lines_re = LazyReCompile(r'\s*')
+tabs_to_spaces_re = LazyReCompile(r'^\t+')
 
 
 def indent_empty_lines(s, compiler):
@@ -30,3 +31,16 @@ def indent_empty_lines(s, compiler):
             result_lines.append(line)
 
     return '\n'.join(result_lines) + ('\n' if ends_with_newline else '')
+
+
+def leading_tabs_to_spaces(s):
+    lines = s.split('\n')
+    result_lines = []
+    tab_to_space = lambda m: len(m.group()) * 4 * ' '
+    for line in lines:
+        result_lines.append(tabs_to_spaces_re.sub(tab_to_space, line))
+    return '\n'.join(result_lines)
+
+
+def preprocess(s, compiler):
+    return indent_empty_lines(leading_tabs_to_spaces(s), compiler)
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -46,7 +46,7 @@
 from bpython.curtsiesfrontend import events as bpythonevents
 from bpython.curtsiesfrontend.parse import parse as bpythonparse
 from bpython.curtsiesfrontend.parse import func_for_letter, color_for_letter
-from bpython.curtsiesfrontend.preprocess import indent_empty_lines
+from bpython.curtsiesfrontend.preprocess import preprocess
 from bpython.curtsiesfrontend.interpreter import Interp, \
     code_finished_will_parse
 
@@ -463,8 +463,8 @@ def process_control_event(self, e):
             if ctrl_char is not None:
                 return self.process_event(ctrl_char)
             simple_events = just_simple_events(e.events)
-            source = indent_empty_lines(''.join(simple_events),
-                                        self.interp.compile)
+            source = preprocess(''.join(simple_events),
+                                self.interp.compile)
 
             with self.in_paste_mode():
                 for ee in source:
@@ -740,7 +740,7 @@ def send_session_to_external_editor(self, filename=None):
         text = self.send_to_external_editor(for_editor)
         lines = text.split('\n')
         from_editor = [line for line in lines if line[:4] != '### ']
-        source = indent_empty_lines('\n'.join(from_editor), self.interp.compile)
+        source = preprocess('\n'.join(from_editor), self.interp.compile)
         self.history = source.split('\n')
         self.reevaluate(insert_into_history=True)
         self.current_line = lines[-1][4:]
diff --git a/bpython/lazyre.py b/bpython/lazyre.py
@@ -48,3 +48,7 @@ def search(self, *args, **kwargs):
     @compile_regex
     def match(self, *args, **kwargs):
         return self.compiled.match(*args, **kwargs)
+
+    @compile_regex
+    def sub(self, *args, **kwargs):
+        return self.compiled.sub(*args, **kwargs)
diff --git a/bpython/test/fodder/original.py b/bpython/test/fodder/original.py
@@ -45,3 +45,5 @@ def foo():
 
 #EndTest
 
+def tabs():
+	return 1
diff --git a/bpython/test/fodder/processed.py b/bpython/test/fodder/processed.py
@@ -43,3 +43,6 @@ def foo():
     return 1
 
 #EndTest
+
+def tabs():
+    return 1
diff --git a/bpython/test/test_preprocess.py b/bpython/test/test_preprocess.py
@@ -11,11 +11,11 @@
 skip = unittest.skip
 
 from bpython.curtsiesfrontend.interpreter import code_finished_will_parse
-from bpython.curtsiesfrontend.preprocess import indent_empty_lines
+from bpython.curtsiesfrontend.preprocess import preprocess
 
 from bpython.test.fodder import original as original, processed
 
-indent_empty = partial(indent_empty_lines, compiler=compiler)
+preproc = partial(preprocess, compiler=compiler)
 
 
 def get_fodder_source(test_name):
@@ -39,9 +39,9 @@ def assertCompiles(self, source):
         return finished and parsable
 
     def test_indent_empty_lines_nops(self):
-        self.assertEqual(indent_empty('hello'), 'hello')
-        self.assertEqual(indent_empty('hello\ngoodbye'), 'hello\ngoodbye')
-        self.assertEqual(indent_empty('a\n    b\nc\n'), 'a\n    b\nc\n')
+        self.assertEqual(preproc('hello'), 'hello')
+        self.assertEqual(preproc('hello\ngoodbye'), 'hello\ngoodbye')
+        self.assertEqual(preproc('a\n    b\nc\n'), 'a\n    b\nc\n')
 
     def assertShowWhitespaceEqual(self, a, b):
         self.assertEqual(
@@ -57,12 +57,12 @@ def assertDefinitionIndented(self, obj):
         obj2 = getattr(processed, name)
         orig = inspect.getsource(obj)
         xformed = inspect.getsource(obj2)
-        self.assertShowWhitespaceEqual(indent_empty(orig), xformed)
+        self.assertShowWhitespaceEqual(preproc(orig), xformed)
         self.assertCompiles(xformed)
 
     def assertLinesIndented(self, test_name):
         orig, xformed = get_fodder_source(test_name)
-        self.assertShowWhitespaceEqual(indent_empty(orig), xformed)
+        self.assertShowWhitespaceEqual(preproc(orig), xformed)
         self.assertCompiles(xformed)
 
     def assertIndented(self, obj_or_name):
@@ -92,3 +92,6 @@ def test_blank_line_in_try_catch_else(self):
 
     def test_blank_trailing_line(self):
         self.assertIndented('blank_trailing_line')
+
+    def test_tabs(self):
+        self.assertIndented(original.tabs)

Original file line number	Diff line number	Diff line change
`@@ -45,3 +45,5 @@ def foo():`
`45`	`45`
`46`	`46`	`#EndTest`
`47`	`47`
	`48`	`+def tabs():`
	`49`	`+ return 1`