Merge branch 'winter-cleanup-2019' of github.com:bpython/bpython into winter-cleanup-2019

ikanobori · ikanobori · commit 48ea30bd8810 · 2019-11-23T17:53:07.000Z
diff --git a/bpython/test/fodder/original.py b/bpython/test/fodder/original.py
@@ -1,37 +1,34 @@
 # careful: whitespace is very important in this file
 # also, this code runs - so everything should be a noop
 
-
 class BlankLineBetweenMethods(object):
     def method1(self):
         pass
 
     def method2(self):
         pass
 
-
 def BlankLineInFunction(self):
     return 7
 
     pass
 
-
-# StartTest-blank_lines_in_for_loop
+#StartTest-blank_lines_in_for_loop
 for i in range(2):
     pass
 
     pass
-# EndTest
+#EndTest
 
-# StartTest-blank_line_in_try_catch
+#StartTest-blank_line_in_try_catch
 try:
     1
 
 except:
     2
-# EndTest
+#EndTest
 
-# StartTest-blank_line_in_try_catch_else
+#StartTest-blank_line_in_try_catch_else
 try:
     1
 
@@ -40,15 +37,13 @@ def BlankLineInFunction(self):
 
 else:
     3
-# EndTest
+#EndTest
 
-# StartTest-blank_trailing_line
+#StartTest-blank_trailing_line
 def foo():
     return 1
 
-
-# EndTest
-
+#EndTest
 
 def tabs():
-    return 1
+	return 1
diff --git a/bpython/test/fodder/processed.py b/bpython/test/fodder/processed.py
@@ -1,53 +1,48 @@
-# careful! Whitespace is very important in this file
-
+#careful! Whitespace is very important in this file
 
 class BlankLineBetweenMethods(object):
     def method1(self):
         pass
-
+    
     def method2(self):
         pass
 
-
 def BlankLineInFunction(self):
     return 7
-
+    
     pass
 
-
-# StartTest-blank_lines_in_for_loop
+#StartTest-blank_lines_in_for_loop
 for i in range(2):
     pass
-
+    
     pass
-# EndTest
+#EndTest
 
-# StartTest-blank_line_in_try_catch
+#StartTest-blank_line_in_try_catch
 try:
     1
-
+    
 except:
     2
-# EndTest
+#EndTest
 
-# StartTest-blank_line_in_try_catch_else
+#StartTest-blank_line_in_try_catch_else
 try:
     1
-
+    
 except:
     2
-
+    
 else:
     3
-# EndTest
+#EndTest
 
-# StartTest-blank_trailing_line
+#StartTest-blank_trailing_line
 def foo():
     return 1
 
-
-# EndTest
-
+#EndTest
 
 def tabs():
     return 1
diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py
@@ -40,7 +40,19 @@ def test_syntaxerror(self):
 
         i.runsource("1.1.1.1")
 
-        if pypy:
+        if sys.version_info[:2] >= (3, 8):
+            expected = (
+                "  File "
+                + green('"<input>"')
+                + ", line "
+                + bold(magenta("1"))
+                + "\n    1.1.1.1\n       ^\n"
+                + bold(red("SyntaxError"))
+                + ": "
+                + cyan("invalid syntax")
+                + "\n"
+            )
+        elif pypy:
             expected = (
                 "  File "
                 + green('"<input>"')
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,5 +14,6 @@ exclude = '''
   | buck-out
   | build
   | dist
+  | bpython/test/fodder
 )/
 '''
