Skip to content

Commit d329f85

Browse files
authored
gh-99430: Remove duplicated tests for old-styled classes (#99432)
python 1 & 2 were a loong time ago.
1 parent 439b9cf commit d329f85

File tree

5 files changed

+6
-139
lines changed

5 files changed

+6
-139
lines changed

Lib/test/pydocfodder.py

Lines changed: 1 addition & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -2,85 +2,7 @@
22

33
import types
44

5-
class A_classic:
6-
"A classic class."
7-
def A_method(self):
8-
"Method defined in A."
9-
def AB_method(self):
10-
"Method defined in A and B."
11-
def AC_method(self):
12-
"Method defined in A and C."
13-
def AD_method(self):
14-
"Method defined in A and D."
15-
def ABC_method(self):
16-
"Method defined in A, B and C."
17-
def ABD_method(self):
18-
"Method defined in A, B and D."
19-
def ACD_method(self):
20-
"Method defined in A, C and D."
21-
def ABCD_method(self):
22-
"Method defined in A, B, C and D."
23-
24-
25-
class B_classic(A_classic):
26-
"A classic class, derived from A_classic."
27-
def AB_method(self):
28-
"Method defined in A and B."
29-
def ABC_method(self):
30-
"Method defined in A, B and C."
31-
def ABD_method(self):
32-
"Method defined in A, B and D."
33-
def ABCD_method(self):
34-
"Method defined in A, B, C and D."
35-
def B_method(self):
36-
"Method defined in B."
37-
def BC_method(self):
38-
"Method defined in B and C."
39-
def BD_method(self):
40-
"Method defined in B and D."
41-
def BCD_method(self):
42-
"Method defined in B, C and D."
43-
44-
class C_classic(A_classic):
45-
"A classic class, derived from A_classic."
46-
def AC_method(self):
47-
"Method defined in A and C."
48-
def ABC_method(self):
49-
"Method defined in A, B and C."
50-
def ACD_method(self):
51-
"Method defined in A, C and D."
52-
def ABCD_method(self):
53-
"Method defined in A, B, C and D."
54-
def BC_method(self):
55-
"Method defined in B and C."
56-
def BCD_method(self):
57-
"Method defined in B, C and D."
58-
def C_method(self):
59-
"Method defined in C."
60-
def CD_method(self):
61-
"Method defined in C and D."
62-
63-
class D_classic(B_classic, C_classic):
64-
"A classic class, derived from B_classic and C_classic."
65-
def AD_method(self):
66-
"Method defined in A and D."
67-
def ABD_method(self):
68-
"Method defined in A, B and D."
69-
def ACD_method(self):
70-
"Method defined in A, C and D."
71-
def ABCD_method(self):
72-
"Method defined in A, B, C and D."
73-
def BD_method(self):
74-
"Method defined in B and D."
75-
def BCD_method(self):
76-
"Method defined in B, C and D."
77-
def CD_method(self):
78-
"Method defined in C and D."
79-
def D_method(self):
80-
"Method defined in D."
81-
82-
83-
class A_new(object):
5+
class A_new:
846
"A new-style class."
857

868
def A_method(self):

Lib/test/test_copy.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ def __getattribute__(self, name):
8888
# Type-specific _copy_xxx() methods
8989

9090
def test_copy_atomic(self):
91-
class Classic:
92-
pass
93-
class NewStyle(object):
91+
class NewStyle:
9492
pass
9593
def f():
9694
pass
@@ -100,7 +98,7 @@ class WithMetaclass(metaclass=abc.ABCMeta):
10098
42, 2**100, 3.14, True, False, 1j,
10199
"hello", "hello\u1234", f.__code__,
102100
b"world", bytes(range(256)), range(10), slice(1, 10, 2),
103-
NewStyle, Classic, max, WithMetaclass, property()]
101+
NewStyle, max, WithMetaclass, property()]
104102
for x in tests:
105103
self.assertIs(copy.copy(x), x)
106104

@@ -350,15 +348,13 @@ def __getattribute__(self, name):
350348
# Type-specific _deepcopy_xxx() methods
351349

352350
def test_deepcopy_atomic(self):
353-
class Classic:
354-
pass
355-
class NewStyle(object):
351+
class NewStyle:
356352
pass
357353
def f():
358354
pass
359355
tests = [None, 42, 2**100, 3.14, True, False, 1j,
360356
"hello", "hello\u1234", f.__code__,
361-
NewStyle, range(10), Classic, max, property()]
357+
NewStyle, range(10), max, property()]
362358
for x in tests:
363359
self.assertIs(copy.deepcopy(x), x)
364360

Lib/test/test_descr.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3261,12 +3261,8 @@ def __get__(self, object, otype):
32613261
if otype:
32623262
otype = otype.__name__
32633263
return 'object=%s; type=%s' % (object, otype)
3264-
class OldClass:
3264+
class NewClass:
32653265
__doc__ = DocDescr()
3266-
class NewClass(object):
3267-
__doc__ = DocDescr()
3268-
self.assertEqual(OldClass.__doc__, 'object=None; type=OldClass')
3269-
self.assertEqual(OldClass().__doc__, 'object=OldClass instance; type=OldClass')
32703266
self.assertEqual(NewClass.__doc__, 'object=None; type=NewClass')
32713267
self.assertEqual(NewClass().__doc__, 'object=NewClass instance; type=NewClass')
32723268

Lib/test/test_gc.py

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -542,48 +542,6 @@ def __getattr__(self, someattribute):
542542
self.assertEqual(gc.collect(), 2)
543543
self.assertEqual(len(gc.garbage), garbagelen)
544544

545-
def test_boom_new(self):
546-
# boom__new and boom2_new are exactly like boom and boom2, except use
547-
# new-style classes.
548-
549-
class Boom_New(object):
550-
def __getattr__(self, someattribute):
551-
del self.attr
552-
raise AttributeError
553-
554-
a = Boom_New()
555-
b = Boom_New()
556-
a.attr = b
557-
b.attr = a
558-
559-
gc.collect()
560-
garbagelen = len(gc.garbage)
561-
del a, b
562-
self.assertEqual(gc.collect(), 2)
563-
self.assertEqual(len(gc.garbage), garbagelen)
564-
565-
def test_boom2_new(self):
566-
class Boom2_New(object):
567-
def __init__(self):
568-
self.x = 0
569-
570-
def __getattr__(self, someattribute):
571-
self.x += 1
572-
if self.x > 1:
573-
del self.attr
574-
raise AttributeError
575-
576-
a = Boom2_New()
577-
b = Boom2_New()
578-
a.attr = b
579-
b.attr = a
580-
581-
gc.collect()
582-
garbagelen = len(gc.garbage)
583-
del a, b
584-
self.assertEqual(gc.collect(), 2)
585-
self.assertEqual(len(gc.garbage), garbagelen)
586-
587545
def test_get_referents(self):
588546
alist = [1, 3, 5]
589547
got = gc.get_referents(alist)

Lib/test/test_unicode.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2380,12 +2380,7 @@ class s1:
23802380
def __repr__(self):
23812381
return '\\n'
23822382

2383-
class s2:
2384-
def __repr__(self):
2385-
return '\\n'
2386-
23872383
self.assertEqual(repr(s1()), '\\n')
2388-
self.assertEqual(repr(s2()), '\\n')
23892384

23902385
def test_printable_repr(self):
23912386
self.assertEqual(repr('\U00010000'), "'%c'" % (0x10000,)) # printable

0 commit comments

Comments
 (0)