Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 48ea30b

Browse filesBrowse files
committed
Merge branch 'winter-cleanup-2019' of github.com:bpython/bpython into winter-cleanup-2019
2 parents befeed4 + 81e7cd8 commit 48ea30b
Copy full SHA for 48ea30b

4 files changed

+38-35Lines changed: 38 additions & 35 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎bpython/test/fodder/original.py‎

Copy file name to clipboard
+9-14Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
11
# careful: whitespace is very important in this file
22
# also, this code runs - so everything should be a noop
33

4-
54
class BlankLineBetweenMethods(object):
65
def method1(self):
76
pass
87

98
def method2(self):
109
pass
1110

12-
1311
def BlankLineInFunction(self):
1412
return 7
1513

1614
pass
1715

18-
19-
# StartTest-blank_lines_in_for_loop
16+
#StartTest-blank_lines_in_for_loop
2017
for i in range(2):
2118
pass
2219

2320
pass
24-
# EndTest
21+
#EndTest
2522

26-
# StartTest-blank_line_in_try_catch
23+
#StartTest-blank_line_in_try_catch
2724
try:
2825
1
2926

3027
except:
3128
2
32-
# EndTest
29+
#EndTest
3330

34-
# StartTest-blank_line_in_try_catch_else
31+
#StartTest-blank_line_in_try_catch_else
3532
try:
3633
1
3734

@@ -40,15 +37,13 @@ def BlankLineInFunction(self):
4037

4138
else:
4239
3
43-
# EndTest
40+
#EndTest
4441

45-
# StartTest-blank_trailing_line
42+
#StartTest-blank_trailing_line
4643
def foo():
4744
return 1
4845

49-
50-
# EndTest
51-
46+
#EndTest
5247

5348
def tabs():
54-
return 1
49+
return 1
Collapse file

‎bpython/test/fodder/processed.py‎

Copy file name to clipboard
+15-20Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,48 @@
1-
# careful! Whitespace is very important in this file
2-
1+
#careful! Whitespace is very important in this file
32

43
class BlankLineBetweenMethods(object):
54
def method1(self):
65
pass
7-
6+
87
def method2(self):
98
pass
109

11-
1210
def BlankLineInFunction(self):
1311
return 7
14-
12+
1513
pass
1614

17-
18-
# StartTest-blank_lines_in_for_loop
15+
#StartTest-blank_lines_in_for_loop
1916
for i in range(2):
2017
pass
21-
18+
2219
pass
23-
# EndTest
20+
#EndTest
2421

25-
# StartTest-blank_line_in_try_catch
22+
#StartTest-blank_line_in_try_catch
2623
try:
2724
1
28-
25+
2926
except:
3027
2
31-
# EndTest
28+
#EndTest
3229

33-
# StartTest-blank_line_in_try_catch_else
30+
#StartTest-blank_line_in_try_catch_else
3431
try:
3532
1
36-
33+
3734
except:
3835
2
39-
36+
4037
else:
4138
3
42-
# EndTest
39+
#EndTest
4340

44-
# StartTest-blank_trailing_line
41+
#StartTest-blank_trailing_line
4542
def foo():
4643
return 1
4744

48-
49-
# EndTest
50-
45+
#EndTest
5146

5247
def tabs():
5348
return 1
Collapse file

‎bpython/test/test_interpreter.py‎

Copy file name to clipboardExpand all lines: bpython/test/test_interpreter.py
+13-1Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,19 @@ def test_syntaxerror(self):
4040

4141
i.runsource("1.1.1.1")
4242

43-
if pypy:
43+
if sys.version_info[:2] >= (3, 8):
44+
expected = (
45+
" File "
46+
+ green('"<input>"')
47+
+ ", line "
48+
+ bold(magenta("1"))
49+
+ "\n 1.1.1.1\n ^\n"
50+
+ bold(red("SyntaxError"))
51+
+ ": "
52+
+ cyan("invalid syntax")
53+
+ "\n"
54+
)
55+
elif pypy:
4456
expected = (
4557
" File "
4658
+ green('"<input>"')
Collapse file

‎pyproject.toml‎

Copy file name to clipboardExpand all lines: pyproject.toml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ exclude = '''
1414
| buck-out
1515
| build
1616
| dist
17+
| bpython/test/fodder
1718
)/
1819
'''

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.