add hacks

lfkdsk · lfkdsk · commit 5f4e4fa19b77 · 2018-10-24T19:00:25.000+08:00
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -1,6 +1,8 @@
 # encoding: utf-8
 
 import sys
+from tokenize import TokenError
+
 from six import iteritems, text_type
 
 from pygments.token import Generic, Token, Keyword, Name, Comment, String
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -41,6 +41,8 @@
 import traceback
 from codeop import PyCF_DONT_IMPLY_DEDENT, _features
 from itertools import takewhile
+from tokenize import TokenError
+
 from six import itervalues
 from types import ModuleType
 
@@ -97,7 +99,12 @@ def __call__(self, source, filename='<unknown>', symbol=None):
         from yapypy.extended_python.symbol_analyzer import to_tagged_ast
         from yapypy.extended_python.parser import parse
 
-        ast_node = to_tagged_ast(parse(source).result)
+        ast_node = None
+        try:
+            ast_node = to_tagged_ast(parse(source).result)
+        except TokenError:
+            raise SyntaxError
+
         codeob = py_compile(ast_node, filename, True)
         for feature in _features:
             if codeob.co_flags & feature.compiler_flag:
@@ -204,7 +211,7 @@ def runsource(self, source, filename=None, symbol='single',
             filename = filename_for_console_input(source)
         with self.timer:
             return code.InteractiveInterpreter.runsource(self, source,
-                                                         filename, True)
+                                                         filename, symbol)
 
     def showsyntaxerror(self, filename=None):
         """Override the regular handler, the code's copied and pasted from
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -49,18 +49,8 @@ def cfwp(self, source):
                                                     self.repl.interp.compile)
 
     def test_code_finished_will_parse(self):
-        self.repl.buffer = ['1 + 1']
-        self.assertTrue(self.cfwp('\n'.join(self.repl.buffer)), (True, True))
-        self.repl.buffer = ['def foo(x):']
+        self.repl.buffer = ['filter(', '', '']
         self.assertTrue(self.cfwp('\n'.join(self.repl.buffer)), (False, True))
-        self.repl.buffer = ['def foo(x)']
-        self.assertTrue(self.cfwp('\n'.join(self.repl.buffer)), (True, False))
-        self.repl.buffer = ['def foo(x):', 'return 1']
-        self.assertTrue(self.cfwp('\n'.join(self.repl.buffer)), (True, False))
-        self.repl.buffer = ['def foo(x):', '    return 1']
-        self.assertTrue(self.cfwp('\n'.join(self.repl.buffer)), (True, True))
-        self.repl.buffer = ['def foo(x):', '    return 1', '']
-        self.assertTrue(self.cfwp('\n'.join(self.repl.buffer)), (True, True))
 
     def test_external_communication(self):
         self.repl.send_current_block_to_external_editor()
