Skip to content

Commit 8c309aa

Browse files
in-code-i-trustslozier
in-code-i-trust
authored and
slozier
committed
Fix usage of deprecated unittest APIs (#717)
This resolves #714 Replace assertEquals() to assertEqual() Replace assertNotEquals() to assertNotEqual() Replace assertRaisesRegexp() to assertRaisesRegex()
1 parent 342e49f commit 8c309aa

15 files changed

Lines changed: 100 additions & 100 deletions

‎Tests/interop/net/field/test_field_misc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_accessibility(self):
2222
o.Set()
2323
self.assertEqual(o.PublicField, 100)
2424
self.assertTrue(not hasattr(o, 'ProtectedField'))
25-
self.assertRaisesRegexp(AttributeError, "'Misc' object has no attribute 'PrivateField'", lambda: o.PrivateField)
25+
self.assertRaisesRegex(AttributeError, "'Misc' object has no attribute 'PrivateField'", lambda: o.PrivateField)
2626
self.assertEqual(o.InterfaceField.PublicStaticField, 500)
2727

2828
o = DerivedMisc()

‎Tests/interop/net/field/test_fields_inside_enum.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ def test_get_set(self):
2121
self.assertEqual(EnumInt32.B, desc)
2222

2323
def f(): o.A = 10
24-
self.assertRaisesRegexp(AttributeError, "attribute 'A' of 'EnumInt32' object is read-only", f)
24+
self.assertRaisesRegex(AttributeError, "attribute 'A' of 'EnumInt32' object is read-only", f)
2525

2626
def f(): EnumInt32.B = 10
27-
self.assertRaisesRegexp(AttributeError, "attribute 'B' of 'EnumInt32' object is read-only", f)
27+
self.assertRaisesRegex(AttributeError, "attribute 'B' of 'EnumInt32' object is read-only", f)
2828

2929
def f(): EnumInt32.B = EnumInt32.A
30-
self.assertRaisesRegexp(AttributeError, "attribute 'B' of 'EnumInt32' object is read-only", f)
30+
self.assertRaisesRegex(AttributeError, "attribute 'B' of 'EnumInt32' object is read-only", f)
3131

3232
def test_enum_bool(self):
3333
from Merlin.Testing.BaseClass import EmptyEnum

‎Tests/interop/net/field/test_initonly_fields.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def _test_get_by_descriptor(self, current_type):
107107
self.assertEqual(current_type.__dict__['InitOnlySimpleInterfaceField'].__get__(None, current_type).Flag, 50)
108108

109109
for t in [current_type, SimpleStruct, SimpleClass]:
110-
self.assertRaisesRegexp(TypeError, "(expected .*, got type)", lambda: current_type.__dict__['InitOnlySimpleGenericClassField'].__get__(t, current_type))
110+
self.assertRaisesRegex(TypeError, "(expected .*, got type)", lambda: current_type.__dict__['InitOnlySimpleGenericClassField'].__get__(t, current_type))
111111

112112
for t in [None, o, SimpleClass, SimpleStruct]:
113113
self.assertEqual(current_type.__dict__['InitOnlyEnumField'].__get__(None, t), EnumInt16.B)
@@ -144,7 +144,7 @@ def f22(): o.InitOnlySimpleGenericClassField = None
144144
def f23(): o.InitOnlySimpleInterfaceField = ClassImplementSimpleInterface(40)
145145

146146
for f in [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19, f20, f21, f22, f23]:
147-
self.assertRaisesRegexp(AttributeError, "attribute .* of .* object is read-only", f)
147+
self.assertRaisesRegex(AttributeError, "attribute .* of .* object is read-only", f)
148148

149149
def _test_set_by_type(self, current_type, message="attribute '.*' of '.*' object is read-only"):
150150
import System
@@ -177,7 +177,7 @@ def f22(): current_type.InitOnlySimpleGenericClassField = None
177177
def f23(): current_type.InitOnlySimpleInterfaceField = ClassImplementSimpleInterface(40)
178178

179179
for f in [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19, f20, f21, f22, f23]:
180-
self.assertRaisesRegexp(AttributeError, message, f)
180+
self.assertRaisesRegex(AttributeError, message, f)
181181

182182
def _test_set_by_descriptor(self, current_type):
183183
o = current_type()
@@ -189,7 +189,7 @@ def _test_set_by_descriptor(self, current_type):
189189
lambda : current_type.__dict__['InitOnlyBooleanField'].__set__(None, False),
190190
lambda : current_type.__dict__['InitOnlySimpleClassField'].__set__(None, None),
191191
]:
192-
self.assertRaisesRegexp(AttributeError, "'.*' object attribute '.*' is read-only", f) # ???
192+
self.assertRaisesRegex(AttributeError, "'.*' object attribute '.*' is read-only", f) # ???
193193

194194
for f in [
195195
lambda : current_type.__dict__['InitOnlySByteField'].__set__(o, 3),
@@ -206,7 +206,7 @@ def _test_set_by_descriptor(self, current_type):
206206
lambda : current_type.__dict__['InitOnlyEnumField'].__set__(current_type, EnumInt32.C),
207207
lambda : current_type.__dict__['InitOnlySimpleInterfaceField'].__set__(o, None),
208208
]:
209-
self.assertRaisesRegexp(AttributeError, "'.*' object attribute 'InitOnly.*Field' is read-only", f)
209+
self.assertRaisesRegex(AttributeError, "'.*' object attribute 'InitOnly.*Field' is read-only", f)
210210

211211
def _test_delete_via_type(self, current_type, message="cannot delete attribute 'InitOnly.*' of builtin type"):
212212
def f1(): del current_type.InitOnlyByteField
@@ -237,7 +237,7 @@ def f22(): del current_type.InitOnlySimpleGenericClassField
237237
def f23(): del current_type.InitOnlySimpleInterfaceField
238238

239239
for f in [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19, f20, f21, f22, f23]:
240-
self.assertRaisesRegexp(AttributeError, message, f)
240+
self.assertRaisesRegex(AttributeError, message, f)
241241

242242
def _test_delete_via_instance(self, current_type, message="cannot delete attribute 'InitOnly.*' of builtin type"):
243243
o = current_type()
@@ -269,7 +269,7 @@ def f22(): del o.InitOnlySimpleGenericClassField
269269
def f23(): del o.InitOnlySimpleInterfaceField
270270

271271
for f in [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19, f20, f21, f22, f23]:
272-
self.assertRaisesRegexp(AttributeError, message, f)
272+
self.assertRaisesRegex(AttributeError, message, f)
273273

274274
def _test_delete_via_descriptor(self, current_type):
275275
o = current_type()
@@ -285,7 +285,7 @@ def _test_delete_via_descriptor(self, current_type):
285285
if i % 4 == 3: arg = SimpleStruct
286286
i += 1
287287

288-
self.assertRaisesRegexp(AttributeError, "cannot delete attribute 'InitOnly.*Field' of builtin type",
288+
self.assertRaisesRegex(AttributeError, "cannot delete attribute 'InitOnly.*Field' of builtin type",
289289
lambda : current_type.__dict__['InitOnly%sField' % x].__delete__(arg))
290290

291291
def test_types(self):

‎Tests/interop/net/field/test_instance_fields.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,9 @@ def f1(): t.InstanceInt16Field.__set__(v, "abc")
252252
def f2(): t.InstanceCharField.__set__(v, "abc")
253253
def f3(): t.InstanceEnumField.__set__(v, EnumInt32.B)
254254

255-
self.assertRaisesRegexp(TypeError, "expected Int16, got str", f1)
256-
self.assertRaisesRegexp(TypeError, "expected string of length 1 when converting to char, got 'abc'", f2)
257-
self.assertRaisesRegexp(TypeError, "expected EnumInt64, got EnumInt32", f3)
255+
self.assertRaisesRegex(TypeError, "expected Int16, got str", f1)
256+
self.assertRaisesRegex(TypeError, "expected string of length 1 when converting to char, got 'abc'", f2)
257+
self.assertRaisesRegex(TypeError, "expected EnumInt64, got EnumInt32", f3)
258258

259259
def _test_set_by_descriptor(self, o, vf, t):
260260
import clr
@@ -333,7 +333,7 @@ def f24(): del current_type.InstanceSimpleInterfaceField
333333

334334
funcs = [ eval("f%s" % i) for i in range(1, 25) ]
335335
for f in funcs:
336-
self.assertRaisesRegexp(AttributeError, "cannot delete attribute", f)
336+
self.assertRaisesRegex(AttributeError, "cannot delete attribute", f)
337337

338338
def _test_delete_by_instance(self, current_type):
339339
o = current_type()
@@ -365,7 +365,7 @@ def f24(): del o.InstanceSimpleInterfaceField
365365

366366
funcs = [ eval("f%s" % i) for i in range(1, 25) ]
367367
for f in funcs:
368-
self.assertRaisesRegexp(AttributeError, "cannot delete attribute", f)
368+
self.assertRaisesRegex(AttributeError, "cannot delete attribute", f)
369369

370370
def _test_delete_by_descriptor(self, current_type):
371371
for x in [
@@ -395,7 +395,7 @@ def _test_delete_by_descriptor(self, current_type):
395395
'SimpleInterface',
396396
]:
397397
for o in [None, current_type, current_type()]:
398-
self.assertRaisesRegexp(AttributeError, "cannot delete attribute", lambda: current_type.__dict__['Instance%sField' % x].__delete__(o))
398+
self.assertRaisesRegex(AttributeError, "cannot delete attribute", lambda: current_type.__dict__['Instance%sField' % x].__delete__(o))
399399

400400
def test_types(self):
401401
import clr

‎Tests/interop/net/field/test_literal_fields.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def f16(): o.LiteralClassField = None
105105
def f17(): o.LiteralInterfaceField = None
106106

107107
for f in [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17]:
108-
self.assertRaisesRegexp(AttributeError, "attribute .* of .* object is read-only", f)
108+
self.assertRaisesRegex(AttributeError, "attribute .* of .* object is read-only", f)
109109

110110
def _test_set_by_type(self, current_type):
111111
from Merlin.Testing.TypeSample import EnumUInt32
@@ -130,7 +130,7 @@ def f16(): current_type.LiteralClassField = None
130130
def f17(): current_type.LiteralInterfaceField = None
131131

132132
for f in [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17]:
133-
self.assertRaisesRegexp(AttributeError, "attribute '.*' of '.*' object is read-only", f)
133+
self.assertRaisesRegex(AttributeError, "attribute '.*' of '.*' object is read-only", f)
134134

135135

136136
def _test_delete_via_type(self, current_type):
@@ -155,7 +155,7 @@ def f16(): del current_type.LiteralClassField
155155
def f17(): del current_type.LiteralInterfaceField
156156

157157
for f in [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17]:
158-
self.assertRaisesRegexp(AttributeError, "cannot delete attribute 'Literal.*Field' of builtin type", f)
158+
self.assertRaisesRegex(AttributeError, "cannot delete attribute 'Literal.*Field' of builtin type", f)
159159

160160
def _test_delete_via_instance(self, current_type, message="cannot delete attribute 'Literal.*Field' of builtin type"):
161161
o = current_type()
@@ -180,7 +180,7 @@ def f16(): del o.LiteralClassField
180180
def f17(): del o.LiteralInterfaceField
181181

182182
for f in [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17]:
183-
self.assertRaisesRegexp(AttributeError, message, f)
183+
self.assertRaisesRegex(AttributeError, message, f)
184184

185185
def test_types(self):
186186
from Merlin.Testing.FieldTest.Literal import ClassWithLiterals, GenericClassWithLiterals, StructWithLiterals, GenericStructWithLiterals

‎Tests/interop/net/field/test_static_fields.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,8 @@ def test_access_from_derived_types(self):
464464
def f1(): o.StaticByteField = 1
465465
def f2(): current_type.StaticByteField = 1
466466

467-
self.assertRaisesRegexp(AttributeError, "'.*' object has no attribute 'StaticByteField'", f1)
468-
self.assertRaisesRegexp(AttributeError, "'.*' object has no attribute 'StaticByteField'", f2)
467+
self.assertRaisesRegex(AttributeError, "'.*' object has no attribute 'StaticByteField'", f1)
468+
self.assertRaisesRegex(AttributeError, "'.*' object has no attribute 'StaticByteField'", f2)
469469

470470
self.assertTrue('StaticByteField' not in current_type.__dict__)
471471

‎Tests/interop/net/property/test_indexercs.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ def test_basic(self):
113113
self.assertTrue(not hasattr(x, 'get_Item'))
114114

115115
# bad arg count
116-
self.assertRaisesRegexp(TypeError, "expected int, got tuple", lambda: x[()])
117-
self.assertRaisesRegexp(TypeError, "__getitem__\(\) takes at most 3 arguments \(4 given\)", lambda: x[1, 2, 3, 4])
116+
self.assertRaisesRegex(TypeError, "expected int, got tuple", lambda: x[()])
117+
self.assertRaisesRegex(TypeError, "__getitem__\(\) takes at most 3 arguments \(4 given\)", lambda: x[1, 2, 3, 4])
118118

119119
# bad arg type
120-
self.assertRaisesRegexp(TypeError, "expected str, got int", lambda: x[1, 2, 3])
120+
self.assertRaisesRegex(TypeError, "expected str, got int", lambda: x[1, 2, 3])
121121

122122
# bad value type
123123
def f(): x[1] = 'abc'
124-
self.assertRaisesRegexp(TypeError, "expected int, got str", f)
124+
self.assertRaisesRegex(TypeError, "expected int, got str", f)
125125

126126

127127
def test_readonly(self):
@@ -130,7 +130,7 @@ def test_readonly(self):
130130
self.assertEqual(x[1], 10)
131131

132132
def f(): x[2] = 20
133-
self.assertRaisesRegexp(TypeError,
133+
self.assertRaisesRegex(TypeError,
134134
"'ReadOnlyIndexer' object does not support item assignment",
135135
f)
136136

@@ -142,7 +142,7 @@ def test_writeonly(self):
142142
x[1] = 10
143143
Flag.Check(11)
144144

145-
self.assertRaisesRegexp(TypeError,
145+
self.assertRaisesRegex(TypeError,
146146
"'WriteOnlyIndexer' object is not subscriptable",
147147
lambda: x[1])
148148

‎Tests/interop/net/property/test_property.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ def test_writeonly(self):
8383
ClassWithWriteOnly.StaticProperty = "dlr"
8484
Flag.Check(12)
8585

86-
self.assertRaisesRegexp(AttributeError,
86+
self.assertRaisesRegex(AttributeError,
8787
"unreadable property",
8888
lambda: ClassWithWriteOnly.__dict__['InstanceProperty'].__get__(x))
89-
self.assertRaisesRegexp(AttributeError,
89+
self.assertRaisesRegex(AttributeError,
9090
"unreadable property",
9191
lambda: ClassWithWriteOnly.__dict__['InstanceProperty'].GetValue(x))
9292

@@ -178,7 +178,7 @@ def w2(): x.StaticSimpleStructProperty = b
178178
def w3(): x.StaticSimpleClassProperty = c
179179

180180
for w in [w1, w2, w3]:
181-
self.assertRaisesRegexp(AttributeError,
181+
self.assertRaisesRegex(AttributeError,
182182
"static property '.*' of '.*' can only be assigned to through a type, not an instance",
183183
w)
184184

@@ -193,16 +193,16 @@ def w3(): x.StaticSimpleClassProperty = c
193193
#self.assertEqual(a, p.GetValue(None))
194194

195195
# static property against instance
196-
self.assertRaisesRegexp(SystemError, "cannot set property", lambda: p.SetValue(x, a))
197-
#self.assertRaisesRegexp(SystemError, "cannot get property", lambda: p.GetValue(x)) # bug 363242
196+
self.assertRaisesRegex(SystemError, "cannot set property", lambda: p.SetValue(x, a))
197+
#self.assertRaisesRegex(SystemError, "cannot get property", lambda: p.GetValue(x)) # bug 363242
198198

199199
p = t.__dict__['InstanceInt32Property']
200200
p.SetValue(x, a)
201201
#self.assertEqual(p.GetValue(x), a) # value type issue again
202202

203203
# instance property against None
204-
self.assertRaisesRegexp(SystemError, "cannot set property", lambda: p.SetValue(None, a))
205-
#self.assertRaisesRegexp(SystemError, "cannot get property", lambda: p.GetValue(None)) # bug 363247
204+
self.assertRaisesRegex(SystemError, "cannot set property", lambda: p.SetValue(None, a))
205+
#self.assertRaisesRegex(SystemError, "cannot get property", lambda: p.GetValue(None)) # bug 363247
206206

207207
p = t.__dict__['StaticSimpleStructProperty']
208208
p.__set__(None, b)
@@ -231,12 +231,12 @@ def w3(): x.StaticSimpleClassProperty = c
231231
def test_delete(self):
232232
from Merlin.Testing.Property import ClassWithProperties, ClassWithReadOnly
233233
def del_p(): del ClassWithProperties.InstanceSimpleStructProperty
234-
self.assertRaisesRegexp(AttributeError,
234+
self.assertRaisesRegex(AttributeError,
235235
"cannot delete attribute 'InstanceSimpleStructProperty' of builtin type 'ClassWithProperties'",
236236
del_p)
237237

238238
def del_p(): del ClassWithReadOnly.InstanceProperty
239-
self.assertRaisesRegexp(AttributeError,
239+
self.assertRaisesRegex(AttributeError,
240240
"cannot delete attribute 'InstanceProperty' of builtin type 'ClassWithReadOnly'",
241241
del_p)
242242

@@ -249,7 +249,7 @@ def test_from_derived_type(self):
249249

250250
t.StaticInt32Property # read
251251
def f(): t.StaticInt32Property = a
252-
self.assertRaisesRegexp(AttributeError,
252+
self.assertRaisesRegex(AttributeError,
253253
"'DerivedClass' object has no attribute 'StaticInt32Property'",
254254
f) # write
255255

0 commit comments

Comments
 (0)