Skip to content

Commit 624e14b

Browse files
bbugyi200bbugyi200
committed
[test] Fix the test strings which had a space at the end of the line
1 parent 5a1fbec commit 624e14b

File tree

5 files changed

+70
-70
lines changed

5 files changed

+70
-70
lines changed

‎blib2to3/pgen2/pgen.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ def calcfirst(self, name: Text) -> None:
167167
for symbol in itsfirst:
168168
if symbol in inverse:
169169
raise ValueError(
170-
"rule %s is ambiguous; %s is in the first sets of %s as well "
171-
"as %s"
170+
"rule %s is ambiguous; %s is in the first sets of %s as well"
171+
" as %s"
172172
% (name, symbol, label, inverse[symbol])
173173
)
174174
inverse[symbol] = label

‎history.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
1.3 / 15.6
2+
4454 / 60
3+
454 / 60

‎tests/data/comments4.py

+16-19
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,39 @@ class C:
1313
# metadata_version errors.
1414
(
1515
{},
16-
"None is an invalid value for Metadata-Version. Error: This field "
17-
"is required. see "
18-
"https://packaging.python.org/specifications/core-metadata",
16+
"None is an invalid value for Metadata-Version. Error: This field is"
17+
" required. see"
18+
" https://packaging.python.org/specifications/core-metadata",
1919
),
2020
(
2121
{"metadata_version": "-1"},
22-
"'-1' is an invalid value for Metadata-Version. Error: Unknown "
23-
"Metadata Version see "
24-
"https://packaging.python.org/specifications/core-metadata",
22+
"'-1' is an invalid value for Metadata-Version. Error: Unknown Metadata"
23+
" Version see"
24+
" https://packaging.python.org/specifications/core-metadata",
2525
),
2626
# name errors.
2727
(
2828
{"metadata_version": "1.2"},
29-
"'' is an invalid value for Name. Error: This field is required. "
30-
"see https://packaging.python.org/specifications/core-metadata",
29+
"'' is an invalid value for Name. Error: This field is required. see"
30+
" https://packaging.python.org/specifications/core-metadata",
3131
),
3232
(
3333
{"metadata_version": "1.2", "name": "foo-"},
34-
"'foo-' is an invalid value for Name. Error: Must start and end "
35-
"with a letter or numeral and contain only ascii numeric and '.', "
36-
"'_' and '-'. see "
37-
"https://packaging.python.org/specifications/core-metadata",
34+
"'foo-' is an invalid value for Name. Error: Must start and end with a"
35+
" letter or numeral and contain only ascii numeric and '.', '_' and"
36+
" '-'. see https://packaging.python.org/specifications/core-metadata",
3837
),
3938
# version errors.
4039
(
4140
{"metadata_version": "1.2", "name": "example"},
42-
"'' is an invalid value for Version. Error: This field is "
43-
"required. see "
44-
"https://packaging.python.org/specifications/core-metadata",
41+
"'' is an invalid value for Version. Error: This field is required. see"
42+
" https://packaging.python.org/specifications/core-metadata",
4543
),
4644
(
4745
{"metadata_version": "1.2", "name": "example", "version": "dog"},
48-
"'dog' is an invalid value for Version. Error: Must start and end "
49-
"with a letter or numeral and contain only ascii numeric and '.', "
50-
"'_' and '-'. see "
51-
"https://packaging.python.org/specifications/core-metadata",
46+
"'dog' is an invalid value for Version. Error: Must start and end with"
47+
" a letter or numeral and contain only ascii numeric and '.', '_' and"
48+
" '-'. see https://packaging.python.org/specifications/core-metadata",
5249
),
5350
],
5451
)

‎tests/data/composition.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ def test(self) -> None:
1010
)
1111
self.assertEqual(
1212
unstyle(str(report)),
13-
"2 files reformatted, 1 file left unchanged, 1 file failed to "
14-
"reformat.",
13+
"2 files reformatted, 1 file left unchanged, 1 file failed to"
14+
" reformat.",
1515
)
1616
self.assertEqual(
1717
unstyle(str(report)),
18-
"2 files reformatted, 2 files left unchanged, 2 files failed to "
19-
"reformat.",
18+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
19+
" reformat.",
2020
)
2121
for i in (a,):
2222
if (

‎tests/test_black.py

+45-45
Original file line numberDiff line numberDiff line change
@@ -346,9 +346,9 @@ def test_expression_diff(self) -> None:
346346
if expected != actual:
347347
dump = black.dump_to_file(actual)
348348
msg = (
349-
"Expected diff isn't equal to the actual. If you made changes to "
350-
"expression.py and this is an anticipated difference, overwrite "
351-
f"tests/data/expression.diff with {dump}"
349+
"Expected diff isn't equal to the actual. If you made changes to"
350+
" expression.py and this is an anticipated difference, overwrite"
351+
f" tests/data/expression.diff with {dump}"
352352
)
353353
self.assertEqual(expected, actual, msg)
354354

@@ -746,8 +746,8 @@ def err(msg: str, **kwargs: Any) -> None:
746746
self.assertEqual(err_lines[-1], "error: cannot format e1: boom")
747747
self.assertEqual(
748748
unstyle(str(report)),
749-
"1 file reformatted, 2 files left unchanged, 1 file failed to "
750-
"reformat.",
749+
"1 file reformatted, 2 files left unchanged, 1 file failed to"
750+
" reformat.",
751751
)
752752
self.assertEqual(report.return_code, 123)
753753
report.done(Path("f3"), black.Changed.YES)
@@ -756,8 +756,8 @@ def err(msg: str, **kwargs: Any) -> None:
756756
self.assertEqual(out_lines[-1], "reformatted f3")
757757
self.assertEqual(
758758
unstyle(str(report)),
759-
"2 files reformatted, 2 files left unchanged, 1 file failed to "
760-
"reformat.",
759+
"2 files reformatted, 2 files left unchanged, 1 file failed to"
760+
" reformat.",
761761
)
762762
self.assertEqual(report.return_code, 123)
763763
report.failed(Path("e2"), "boom")
@@ -766,8 +766,8 @@ def err(msg: str, **kwargs: Any) -> None:
766766
self.assertEqual(err_lines[-1], "error: cannot format e2: boom")
767767
self.assertEqual(
768768
unstyle(str(report)),
769-
"2 files reformatted, 2 files left unchanged, 2 files failed to "
770-
"reformat.",
769+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
770+
" reformat.",
771771
)
772772
self.assertEqual(report.return_code, 123)
773773
report.path_ignored(Path("wat"), "no match")
@@ -776,8 +776,8 @@ def err(msg: str, **kwargs: Any) -> None:
776776
self.assertEqual(out_lines[-1], "wat ignored: no match")
777777
self.assertEqual(
778778
unstyle(str(report)),
779-
"2 files reformatted, 2 files left unchanged, 2 files failed to "
780-
"reformat.",
779+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
780+
" reformat.",
781781
)
782782
self.assertEqual(report.return_code, 123)
783783
report.done(Path("f4"), black.Changed.NO)
@@ -786,22 +786,22 @@ def err(msg: str, **kwargs: Any) -> None:
786786
self.assertEqual(out_lines[-1], "f4 already well formatted, good job.")
787787
self.assertEqual(
788788
unstyle(str(report)),
789-
"2 files reformatted, 3 files left unchanged, 2 files failed to "
790-
"reformat.",
789+
"2 files reformatted, 3 files left unchanged, 2 files failed to"
790+
" reformat.",
791791
)
792792
self.assertEqual(report.return_code, 123)
793793
report.check = True
794794
self.assertEqual(
795795
unstyle(str(report)),
796-
"2 files would be reformatted, 3 files would be left unchanged, 2 "
797-
"files would fail to reformat.",
796+
"2 files would be reformatted, 3 files would be left unchanged, 2 files"
797+
" would fail to reformat.",
798798
)
799799
report.check = False
800800
report.diff = True
801801
self.assertEqual(
802802
unstyle(str(report)),
803-
"2 files would be reformatted, 3 files would be left unchanged, "
804-
"2 files would fail to reformat.",
803+
"2 files would be reformatted, 3 files would be left unchanged, 2 files"
804+
" would fail to reformat.",
805805
)
806806

807807
def test_report_quiet(self) -> None:
@@ -843,17 +843,17 @@ def err(msg: str, **kwargs: Any) -> None:
843843
self.assertEqual(err_lines[-1], "error: cannot format e1: boom")
844844
self.assertEqual(
845845
unstyle(str(report)),
846-
"1 file reformatted, 2 files left unchanged, 1 file failed to "
847-
"reformat.",
846+
"1 file reformatted, 2 files left unchanged, 1 file failed to"
847+
" reformat.",
848848
)
849849
self.assertEqual(report.return_code, 123)
850850
report.done(Path("f3"), black.Changed.YES)
851851
self.assertEqual(len(out_lines), 0)
852852
self.assertEqual(len(err_lines), 1)
853853
self.assertEqual(
854854
unstyle(str(report)),
855-
"2 files reformatted, 2 files left unchanged, 1 file failed to "
856-
"reformat.",
855+
"2 files reformatted, 2 files left unchanged, 1 file failed to"
856+
" reformat.",
857857
)
858858
self.assertEqual(report.return_code, 123)
859859
report.failed(Path("e2"), "boom")
@@ -862,40 +862,40 @@ def err(msg: str, **kwargs: Any) -> None:
862862
self.assertEqual(err_lines[-1], "error: cannot format e2: boom")
863863
self.assertEqual(
864864
unstyle(str(report)),
865-
"2 files reformatted, 2 files left unchanged, 2 files failed to "
866-
"reformat.",
865+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
866+
" reformat.",
867867
)
868868
self.assertEqual(report.return_code, 123)
869869
report.path_ignored(Path("wat"), "no match")
870870
self.assertEqual(len(out_lines), 0)
871871
self.assertEqual(len(err_lines), 2)
872872
self.assertEqual(
873873
unstyle(str(report)),
874-
"2 files reformatted, 2 files left unchanged, 2 files failed to "
875-
"reformat.",
874+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
875+
" reformat.",
876876
)
877877
self.assertEqual(report.return_code, 123)
878878
report.done(Path("f4"), black.Changed.NO)
879879
self.assertEqual(len(out_lines), 0)
880880
self.assertEqual(len(err_lines), 2)
881881
self.assertEqual(
882882
unstyle(str(report)),
883-
"2 files reformatted, 3 files left unchanged, 2 files failed to "
884-
"reformat.",
883+
"2 files reformatted, 3 files left unchanged, 2 files failed to"
884+
" reformat.",
885885
)
886886
self.assertEqual(report.return_code, 123)
887887
report.check = True
888888
self.assertEqual(
889889
unstyle(str(report)),
890-
"2 files would be reformatted, 3 files would be left unchanged, 2 "
891-
"files would fail to reformat.",
890+
"2 files would be reformatted, 3 files would be left unchanged, 2 files"
891+
" would fail to reformat.",
892892
)
893893
report.check = False
894894
report.diff = True
895895
self.assertEqual(
896896
unstyle(str(report)),
897-
"2 files would be reformatted, 3 files would be left unchanged, "
898-
"2 files would fail to reformat.",
897+
"2 files would be reformatted, 3 files would be left unchanged, 2 files"
898+
" would fail to reformat.",
899899
)
900900

901901
def test_report_normal(self) -> None:
@@ -939,8 +939,8 @@ def err(msg: str, **kwargs: Any) -> None:
939939
self.assertEqual(err_lines[-1], "error: cannot format e1: boom")
940940
self.assertEqual(
941941
unstyle(str(report)),
942-
"1 file reformatted, 2 files left unchanged, 1 file failed to "
943-
"reformat.",
942+
"1 file reformatted, 2 files left unchanged, 1 file failed to"
943+
" reformat.",
944944
)
945945
self.assertEqual(report.return_code, 123)
946946
report.done(Path("f3"), black.Changed.YES)
@@ -949,8 +949,8 @@ def err(msg: str, **kwargs: Any) -> None:
949949
self.assertEqual(out_lines[-1], "reformatted f3")
950950
self.assertEqual(
951951
unstyle(str(report)),
952-
"2 files reformatted, 2 files left unchanged, 1 file failed to "
953-
"reformat.",
952+
"2 files reformatted, 2 files left unchanged, 1 file failed to"
953+
" reformat.",
954954
)
955955
self.assertEqual(report.return_code, 123)
956956
report.failed(Path("e2"), "boom")
@@ -959,40 +959,40 @@ def err(msg: str, **kwargs: Any) -> None:
959959
self.assertEqual(err_lines[-1], "error: cannot format e2: boom")
960960
self.assertEqual(
961961
unstyle(str(report)),
962-
"2 files reformatted, 2 files left unchanged, 2 files failed to "
963-
"reformat.",
962+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
963+
" reformat.",
964964
)
965965
self.assertEqual(report.return_code, 123)
966966
report.path_ignored(Path("wat"), "no match")
967967
self.assertEqual(len(out_lines), 2)
968968
self.assertEqual(len(err_lines), 2)
969969
self.assertEqual(
970970
unstyle(str(report)),
971-
"2 files reformatted, 2 files left unchanged, 2 files failed to "
972-
"reformat.",
971+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
972+
" reformat.",
973973
)
974974
self.assertEqual(report.return_code, 123)
975975
report.done(Path("f4"), black.Changed.NO)
976976
self.assertEqual(len(out_lines), 2)
977977
self.assertEqual(len(err_lines), 2)
978978
self.assertEqual(
979979
unstyle(str(report)),
980-
"2 files reformatted, 3 files left unchanged, 2 files failed to "
981-
"reformat.",
980+
"2 files reformatted, 3 files left unchanged, 2 files failed to"
981+
" reformat.",
982982
)
983983
self.assertEqual(report.return_code, 123)
984984
report.check = True
985985
self.assertEqual(
986986
unstyle(str(report)),
987-
"2 files would be reformatted, 3 files would be left unchanged, 2 "
988-
"files would fail to reformat.",
987+
"2 files would be reformatted, 3 files would be left unchanged, 2 files"
988+
" would fail to reformat.",
989989
)
990990
report.check = False
991991
report.diff = True
992992
self.assertEqual(
993993
unstyle(str(report)),
994-
"2 files would be reformatted, 3 files would be left unchanged, "
995-
"2 files would fail to reformat.",
994+
"2 files would be reformatted, 3 files would be left unchanged, 2 files"
995+
" would fail to reformat.",
996996
)
997997

998998
def test_lib2to3_parse(self) -> None:

0 commit comments

Comments
 (0)