diff --git a/Milter/dynip.py b/Milter/dynip.py index 9fe8e1f5f9dc2c62ff3758ac14ad5b8c2e34a0b0..bb653ce38caf82ea33299721c7495a9a832d5d00 100644 --- a/Milter/dynip.py +++ b/Milter/dynip.py @@ -54,11 +54,11 @@ def is_dynip(host,addr): if host.find(addr) >= 0: return True if addr.find(':') >= 0: return False # IP6 a = addr.split('.') - ia = map(int,a) + ia = list(map(int,a)) h = host m = ip3.findall(host) if m: - g = map(int,m)[:4] + g = list(map(int,m))[:4] ia3 = (ia[1:],ia[:3]) if g[-3:] in ia3: return True if g[0] == ia[3] and g[1:3] == ia[:2]: return True diff --git a/Milter/utils.py b/Milter/utils.py index 0637ee450dd3c798d79da3b0dfe23a63848661aa..9d90206d2ee25a6d253a05ad066140953e78b5c1 100644 --- a/Milter/utils.py +++ b/Milter/utils.py @@ -133,7 +133,7 @@ def parseaddr(t): >>> parseaddr('God@heaven <@hop1.org,@hop2.net:jeff@spec.org>') ('God@heaven', 'jeff@spec.org') >>> parseaddr('Real Name ((comment)) <addr...@example.com>') - ('Real Name', 'addr...@example.com') + ('Real Name (comment)', 'addr...@example.com') >>> parseaddr('a(WRONG)@b') ('WRONG', 'a@b') """ diff --git a/testutils.py b/testutils.py index 23cafbe251a2fc59cfd83ef6f13f2a86b6803b45..fe704cc3a3a8dcbdfc295f801dd5e98d78d78790 100644 --- a/testutils.py +++ b/testutils.py @@ -43,7 +43,7 @@ class AddrCacheTestCase(unittest.TestCase): def testParseHeader(self): s='=?UTF-8?B?TGFzdCBGZXcgQ29sZHBsYXkgQWxidW0gQXJ0d29ya3MgQXZhaWxhYmxlAA?=' h = Milter.utils.parse_header(s) - self.assertEqual(h,'Last Few Coldplay Album Artworks Available\x00') + self.assertEqual(h,b'Last Few Coldplay Album Artworks Available\x00') def suite(): s = unittest.makeSuite(AddrCacheTestCase,'test')