DandelionNStuff/pymilter
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove calls to the deprecated method "assertEquals" (#57)

Browse Source 
It has been removed in python 3.12
This commit is contained in:
Jaime Marquínez Ferrándiz
2024-03-12 03:27:18 +01:00
committed by GitHub
parent 7deec90a59
commit 1c05080768
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testsample.py
+3 -3
View File
@@ -31,7 +31,7 @@ class BMSMilterTestCase(unittest.TestCase):
count = 10 count = 10
while count > 0: while count > 0:
rc = ctx._connect(helo='milter-template.example.org') rc = ctx._connect(helo='milter-template.example.org')
self.assertEquals(rc,Milter.CONTINUE) self.assertEqual(rc,Milter.CONTINUE)
with open('test/'+fname,'rb') as fp: with open('test/'+fname,'rb') as fp:
rc = ctx._feedFile(fp) rc = ctx._feedFile(fp)
milter = ctx.getpriv() milter = ctx.getpriv()
@@ -46,7 +46,7 @@ class BMSMilterTestCase(unittest.TestCase):
ctx._setsymval('{auth_type}','batcomputer') ctx._setsymval('{auth_type}','batcomputer')
ctx._setsymval('j','mailhost') ctx._setsymval('j','mailhost')
rc = ctx._connect() rc = ctx._connect()
self.assertEquals(rc,Milter.CONTINUE) self.assertEqual(rc,Milter.CONTINUE)
with open('test/'+fname,'rb') as fp: with open('test/'+fname,'rb') as fp:
rc = ctx._feedFile(fp) rc = ctx._feedFile(fp)
milter = ctx.getpriv() milter = ctx.getpriv()
@@ -69,7 +69,7 @@ class BMSMilterTestCase(unittest.TestCase):
milter = ctx.getpriv() milter = ctx.getpriv()
# self.assertTrue(milter.user == 'batman',"getsymval failed: "+ # self.assertTrue(milter.user == 'batman',"getsymval failed: "+
# "%s != %s"%(milter.user,'batman')) # "%s != %s"%(milter.user,'batman'))
self.assertEquals(milter.user,'batman') self.assertEqual(milter.user,'batman')
self.assertTrue(milter.auth_type != 'batcomputer',"setsymlist failed") self.assertTrue(milter.auth_type != 'batcomputer',"setsymlist failed")
self.assertTrue(rc == Milter.ACCEPT) self.assertTrue(rc == Milter.ACCEPT)
self.assertTrue(ctx._bodyreplaced,"Message body not replaced") self.assertTrue(ctx._bodyreplaced,"Message body not replaced")
testutils.py
+2 -2
View File
@@ -24,11 +24,11 @@ class AddrCacheTestCase(unittest.TestCase):
self.assertTrue(cache.has_key('foo@bar.com')) self.assertTrue(cache.has_key('foo@bar.com'))
self.assertTrue(not cache.has_key('hello@bar.com')) self.assertTrue(not cache.has_key('hello@bar.com'))
self.assertTrue('baz@bar.com' in cache) self.assertTrue('baz@bar.com' in cache)
self.assertEquals(cache['temp@bar.com'],'testing') self.assertEqual(cache['temp@bar.com'],'testing')
s = open(self.fname).readlines() s = open(self.fname).readlines()
self.assertTrue(len(s) == 2) self.assertTrue(len(s) == 2)
self.assertTrue(s[0].startswith('foo@bar.com ')) self.assertTrue(s[0].startswith('foo@bar.com '))
self.assertEquals(s[1].strip(),'baz@bar.com') self.assertEqual(s[1].strip(),'baz@bar.com')
# check that new result overrides old # check that new result overrides old
cache['temp@bar.com'] = None cache['temp@bar.com'] = None
self.assertTrue(not cache['temp@bar.com']) self.assertTrue(not cache['temp@bar.com'])