Skip to content

Commit 8100c63

Browse files
cscorleycscorley
committed
Replace type() with try/except
1 parent 39f4b04 commit 8100c63

File tree

4 files changed

+86
-91
lines changed

4 files changed

+86
-91
lines changed

‎tests/test_apply.py‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ def setUp(self):
1717
self.tzu = f.read().splitlines()
1818

1919
def test_truth(self):
20-
self.assertEquals(type(self.lao), list)
21-
self.assertEquals(type(self.tzu), list)
22-
self.assertEquals(len(self.lao), 11)
23-
self.assertEquals(len(self.tzu), 13)
20+
self.assertEqual(type(self.lao), list)
21+
self.assertEqual(type(self.tzu), list)
22+
self.assertEqual(len(self.lao), 11)
23+
self.assertEqual(len(self.tzu), 13)
2424

2525
def test_diff_default(self):
2626
with open('tests/casefiles/diff-default.diff') as f:
@@ -30,7 +30,7 @@ def test_diff_default(self):
3030
diff = diff[0]
3131

3232
new_text = wtp.apply.apply_diff(diff, self.lao)
33-
self.assertEquals(new_text, self.tzu)
33+
self.assertEqual(new_text, self.tzu)
3434

3535
def test_diff_context(self):
3636
with open('tests/casefiles/diff-context.diff') as f:
@@ -40,7 +40,7 @@ def test_diff_context(self):
4040
diff = diff[0]
4141

4242
new_text = wtp.apply.apply_diff(diff, self.lao)
43-
self.assertEquals(new_text, self.tzu)
43+
self.assertEqual(new_text, self.tzu)
4444

4545
def test_diff_unified(self):
4646
with open('tests/casefiles/diff-unified.diff') as f:
@@ -50,13 +50,8 @@ def test_diff_unified(self):
5050
diff = diff[0]
5151

5252
new_text = wtp.apply.apply_diff(diff, self.lao)
53-
for e in self.tzu:
54-
print(e)
55-
print('~~~~')
56-
for e in new_text:
57-
print(e)
5853

59-
self.assertEquals(new_text, self.tzu)
54+
self.assertEqual(new_text, self.tzu)
6055

6156
def test_diff_unified_patchutil(self):
6257
with open('tests/casefiles/diff-unified.diff') as f:
@@ -66,7 +61,7 @@ def test_diff_unified_patchutil(self):
6661
diff = diff[0]
6762

6863
new_text = wtp.apply.apply_diff(diff, self.lao, use_patch=True)
69-
self.assertEquals(new_text, (self.tzu, None))
64+
self.assertEqual(new_text, (self.tzu, None))
7065

7166
self.assertRaises(AssertionError, wtp.apply.apply_diff, diff, [''] + self.lao, use_patch=True)
7267

@@ -78,24 +73,21 @@ def test_diff_rcs(self):
7873
diff = diff[0]
7974

8075
new_text = wtp.apply.apply_diff(diff, self.lao)
81-
self.assertEquals(new_text, self.tzu)
76+
self.assertEqual(new_text, self.tzu)
8277

8378
def test_diff_ed(self):
8479
self.maxDiff = None
8580
with open('tests/casefiles/diff-ed.diff') as f:
8681
diff_text = f.read()
87-
print(diff_text)
88-
print(diff_text.splitlines())
8982

9083
diff = [x for x in wtp.parse_patch(diff_text)]
9184
diff = diff[0]
9285

93-
print(diff)
9486
new_text = wtp.apply.apply_diff(diff, self.lao)
95-
self.assertEquals(self.tzu,new_text)
87+
self.assertEqual(self.tzu,new_text)
9688

9789
new_text = wtp.apply.apply_diff(diff, self.lao, use_patch=True)
98-
self.assertEquals(new_text, (self.tzu, None))
90+
self.assertEqual(new_text, (self.tzu, None))
9991

10092
if __name__ == '__main__':
10193
unittest.main()

‎tests/test_patch.py‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ def test_default_diff(self):
6464
]
6565

6666
results = [x for x in wtp.patch.parse_default_diff(text)]
67-
self.assertEquals(results, expected)
67+
self.assertEqual(results, expected)
6868

6969
expected_main = [wtp.patch.diffobj(header=None, changes=expected, text=text)]
7070
results_main = [x for x in wtp.patch.parse_patch(text)]
71-
self.assertEquals(results_main, expected_main)
71+
self.assertEqual(results_main, expected_main)
7272

7373
def test_svn_unified_patch(self):
7474
with open('tests/casefiles/svn-unified.patch') as f:
@@ -160,7 +160,7 @@ def test_svn_unified_patch(self):
160160

161161
results = [x for x in wtp.parse_patch(text)]
162162

163-
self.assertEquals(results, expected)
163+
self.assertEqual(results, expected)
164164

165165
def test_svn_context_patch(self):
166166
with open('tests/casefiles/svn-context.patch') as f:
@@ -252,7 +252,7 @@ def test_svn_context_patch(self):
252252

253253
results = [x for x in wtp.parse_patch(text)]
254254

255-
self.assertEquals(results, expected)
255+
self.assertEqual(results, expected)
256256

257257
def test_svn_git_patch(self):
258258
with open('tests/casefiles/svn-git.patch') as f:
@@ -345,7 +345,7 @@ def test_svn_git_patch(self):
345345

346346
results = [x for x in wtp.parse_patch(text)]
347347

348-
self.assertEquals(results, expected)
348+
self.assertEqual(results, expected)
349349

350350
def test_svn_rcs_patch(self):
351351
with open('tests/casefiles/svn-rcs.patch') as f:
@@ -407,7 +407,7 @@ def test_svn_rcs_patch(self):
407407
]
408408

409409
results = [x for x in wtp.parse_patch(text)]
410-
self.assertEquals(results, expected)
410+
self.assertEqual(results, expected)
411411

412412

413413
def test_svn_default_patch(self):
@@ -470,7 +470,7 @@ def test_svn_default_patch(self):
470470
)
471471
]
472472
results = [x for x in wtp.parse_patch(text)]
473-
self.assertEquals(results, expected)
473+
self.assertEqual(results, expected)
474474

475475

476476
def test_git_patch(self):
@@ -542,7 +542,7 @@ def test_git_patch(self):
542542

543543
results = [x for x in wtp.parse_patch(text)]
544544

545-
self.assertEquals(results, expected)
545+
self.assertEqual(results, expected)
546546

547547

548548
def test_git_header(self):
@@ -561,10 +561,10 @@ def test_git_header(self):
561561
new_version = '456e34f')
562562

563563
results = wtp.patch.parse_git_header(text)
564-
self.assertEquals(results, expected)
564+
self.assertEqual(results, expected)
565565

566566
results_main = wtp.patch.parse_header(text)
567-
self.assertEquals(results_main, expected)
567+
self.assertEqual(results_main, expected)
568568

569569
def test_svn_header(self):
570570
text = """
@@ -581,10 +581,10 @@ def test_svn_header(self):
581581
new_path = 'bugtrace/trunk/src/bugtrace/csc.py',
582582
new_version = 12784)
583583
results = wtp.patch.parse_svn_header(text)
584-
self.assertEquals(results, expected)
584+
self.assertEqual(results, expected)
585585

586586
results_main = wtp.patch.parse_header(text)
587-
self.assertEquals(results_main, expected)
587+
self.assertEqual(results_main, expected)
588588

589589
def test_cvs_header(self):
590590
text = """Index: org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java
@@ -604,10 +604,10 @@ def test_cvs_header(self):
604604
new_path = 'org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java',
605605
new_version = '1.8')
606606
results = wtp.patch.parse_cvs_header(text)
607-
self.assertEquals(results, expected)
607+
self.assertEqual(results, expected)
608608

609609
results_main = wtp.patch.parse_header(text)
610-
self.assertEquals(results_main, expected)
610+
self.assertEqual(results_main, expected)
611611

612612
def test_unified_header(self):
613613
text = """--- /tmp/o 2012-12-22 06:43:35.000000000 -0600
@@ -622,10 +622,10 @@ def test_unified_header(self):
622622
new_version = '2012-12-23 20:40:50.000000000 -0600')
623623

624624
results = wtp.patch.parse_unified_header(text)
625-
self.assertEquals(results, expected)
625+
self.assertEqual(results, expected)
626626

627627
results_main = wtp.patch.parse_header(text)
628-
self.assertEquals(results_main, expected)
628+
self.assertEqual(results_main, expected)
629629

630630
def test_unified_header_notab(self):
631631
text = """--- /tmp/some file 2012-12-22 06:43:35.000000000 -0600
@@ -640,10 +640,10 @@ def test_unified_header_notab(self):
640640
new_version = '2012-12-23 20:40:50.000000000 -0600')
641641

642642
results = wtp.patch.parse_unified_header(text)
643-
self.assertEquals(results, expected)
643+
self.assertEqual(results, expected)
644644

645645
results_main = wtp.patch.parse_header(text)
646-
self.assertEquals(results_main, expected)
646+
self.assertEqual(results_main, expected)
647647

648648

649649
def test_unified_diff(self):
@@ -726,11 +726,11 @@ def test_unified_diff(self):
726726
]
727727

728728
results = [x for x in wtp.patch.parse_unified_diff(text)]
729-
self.assertEquals(results, expected)
729+
self.assertEqual(results, expected)
730730

731731
expected_main = [wtp.patch.diffobj(header=None, changes=expected, text=text)]
732732
results_main = [x for x in wtp.patch.parse_patch(text)]
733-
self.assertEquals(results_main, expected_main)
733+
self.assertEqual(results_main, expected_main)
734734

735735
def test_diff_unified_blah(self):
736736
with open('tests/casefiles/diff-unified-blah.diff') as f:
@@ -767,7 +767,7 @@ def test_diff_unified_blah(self):
767767

768768

769769
results = [x for x in wtp.patch.parse_patch(text)]
770-
self.assertEquals(results, expected)
770+
self.assertEqual(results, expected)
771771

772772
def test_diff_context_blah(self):
773773
with open('tests/casefiles/diff-context-blah.diff') as f:
@@ -804,7 +804,7 @@ def test_diff_context_blah(self):
804804

805805

806806
results = [x for x in wtp.patch.parse_patch(text)]
807-
self.assertEquals(results, expected)
807+
self.assertEqual(results, expected)
808808

809809
def test_diff_default_blah(self):
810810
with open('tests/casefiles/diff-default-blah.diff') as f:
@@ -835,7 +835,7 @@ def test_diff_default_blah(self):
835835

836836

837837
results = [x for x in wtp.patch.parse_patch(text)]
838-
self.assertEquals(results, expected)
838+
self.assertEqual(results, expected)
839839

840840

841841
def test_context_header(self):
@@ -851,10 +851,10 @@ def test_context_header(self):
851851
new_version = '2012-12-23 20:40:50.000000000 -0600')
852852

853853
results = wtp.patch.parse_context_header(text)
854-
self.assertEquals(results, expected)
854+
self.assertEqual(results, expected)
855855

856856
results_main = wtp.patch.parse_header(text)
857-
self.assertEquals(results_main, expected)
857+
self.assertEqual(results_main, expected)
858858

859859

860860
def test_context_diff(self):
@@ -954,11 +954,11 @@ def test_context_diff(self):
954954
]
955955

956956
results = [x for x in wtp.patch.parse_context_diff(text)]
957-
self.assertEquals(results, expected)
957+
self.assertEqual(results, expected)
958958

959959
expected_main = [wtp.patch.diffobj(header=None, changes=expected, text=text)]
960960
results_main = [x for x in wtp.patch.parse_patch(text)]
961-
self.assertEquals(results_main, expected_main)
961+
self.assertEqual(results_main, expected_main)
962962

963963
def test_ed_diff(self):
964964
text = """24a
@@ -1011,11 +1011,11 @@ def test_ed_diff(self):
10111011
]
10121012

10131013
results = [x for x in wtp.patch.parse_ed_diff(text)]
1014-
self.assertEquals(results, expected)
1014+
self.assertEqual(results, expected)
10151015

10161016
expected_main = [wtp.patch.diffobj(header=None, changes=expected, text=text)]
10171017
results_main = [x for x in wtp.patch.parse_patch(text)]
1018-
self.assertEquals(results_main, expected_main)
1018+
self.assertEqual(results_main, expected_main)
10191019

10201020
def test_rcs_ed_diff(self):
10211021
text="""a0 6
@@ -1067,11 +1067,11 @@ def test_rcs_ed_diff(self):
10671067
]
10681068

10691069
results = [x for x in wtp.patch.parse_rcs_ed_diff(text)]
1070-
self.assertEquals(results, expected)
1070+
self.assertEqual(results, expected)
10711071

10721072
expected_main = [wtp.patch.diffobj(header=None, changes=expected, text=text)]
10731073
results_main = [x for x in wtp.patch.parse_patch(text)]
1074-
self.assertEquals(results_main, expected_main)
1074+
self.assertEqual(results_main, expected_main)
10751075

10761076
def test_embedded_diff_in_comment(self):
10771077
with open('tests/casefiles/embedded-diff.comment') as f:
@@ -1102,7 +1102,7 @@ def test_embedded_diff_in_comment(self):
11021102
]
11031103

11041104
results = [x for x in wtp.patch.parse_patch(text)]
1105-
self.assertEquals(results, expected)
1105+
self.assertEqual(results, expected)
11061106

11071107
def test_mozilla_527452_5_comment(self):
11081108
with open('tests/casefiles/mozilla-527452-5.comment') as f:
@@ -1135,7 +1135,7 @@ def test_mozilla_527452_5_comment(self):
11351135
]
11361136

11371137
results = [x for x in wtp.patch.parse_patch(text)]
1138-
self.assertEquals(results, expected)
1138+
self.assertEqual(results, expected)
11391139

11401140
def test_dos_unified_cvs(self):
11411141
with open('tests/casefiles/mozilla-560291.diff') as f:
@@ -1169,7 +1169,7 @@ def test_dos_unified_cvs(self):
11691169
]
11701170

11711171
results = [x for x in wtp.patch.parse_patch(text)]
1172-
self.assertEquals(results, expected)
1172+
self.assertEqual(results, expected)
11731173

11741174

11751175
def test_old_style_cvs(self):
@@ -1197,10 +1197,10 @@ def test_old_style_cvs(self):
11971197
]
11981198

11991199
results = wtp.patch.parse_cvs_header(text)
1200-
self.assertEquals(results, expected[0].header)
1200+
self.assertEqual(results, expected[0].header)
12011201

12021202
results = [x for x in wtp.patch.parse_patch(text)]
1203-
self.assertEquals(results, expected)
1203+
self.assertEqual(results, expected)
12041204

12051205
def test_apache_attachment_2241(self):
12061206
with open('tests/casefiles/apache-attachment-2241.diff') as f:
@@ -1232,7 +1232,7 @@ def test_apache_attachment_2241(self):
12321232
]
12331233

12341234
results = [x for x in wtp.patch.parse_patch(text)]
1235-
self.assertEquals(results, expected)
1235+
self.assertEqual(results, expected)
12361236

12371237
def test_space_in_path_header(self):
12381238
with open('tests/casefiles/eclipse-attachment-126343.header') as f:
@@ -1247,7 +1247,7 @@ def test_space_in_path_header(self):
12471247
)
12481248

12491249
results = wtp.patch.parse_header(text)
1250-
self.assertEquals(results, expected)
1250+
self.assertEqual(results, expected)
12511251

12521252
def test_svn_mixed_line_ends(self):
12531253
with open('tests/casefiles/svn-mixed_line_ends.patch') as f:
@@ -1261,7 +1261,7 @@ def test_svn_mixed_line_ends(self):
12611261
new_version=None)
12621262

12631263
results = [x for x in wtp.patch.parse_patch(text)]
1264-
self.assertEquals(results[0].header, expected_header)
1264+
self.assertEqual(results[0].header, expected_header)
12651265

12661266

12671267

0 commit comments

Comments
 (0)