From 547fb39f2a354ee495267c0d73c939ee83a30b33 Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Thu, 11 Aug 2016 15:38:07 -0400 Subject: [PATCH] More python3 fixes. Run pyip6 doctests in test suite. --- .gitignore | 4 ++++ Milter/__init__.py | 2 +- Milter/pyip6.py | 4 ++-- testutils.py | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a620989 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.pyc +build/ +test/*.out +test/*.tstout diff --git a/Milter/__init__.py b/Milter/__init__.py index 7992b9e..8946a49 100755 --- a/Milter/__init__.py +++ b/Milter/__init__.py @@ -9,7 +9,7 @@ # This code is under the GNU General Public License. See COPYING for details. from __future__ import print_function -__version__ = '0.9.8' +__version__ = '1.0.1' import os import re diff --git a/Milter/pyip6.py b/Milter/pyip6.py index 3921413..ea62496 100644 --- a/Milter/pyip6.py +++ b/Milter/pyip6.py @@ -81,7 +81,7 @@ def inet_pton(p): (0, 0, 0, 0, 0, 65535, 258, 772) >>> try: inet_pton('::1.2.3.4.5') - ... except ValueError,x: print(x) + ... except ValueError as x: print(x) ::1.2.3.4.5 """ if p == '::': @@ -115,4 +115,4 @@ def inet_pton(p): return struct.pack('!HHHHHHHH', *[int(s,16) for s in a[0].split(':')]) except ValueError: pass - raise ValueError,p + raise ValueError(p) diff --git a/testutils.py b/testutils.py index c120ca1..23cafbe 100644 --- a/testutils.py +++ b/testutils.py @@ -5,6 +5,7 @@ import os import Milter.utils from Milter.cache import AddrCache from Milter.dynip import is_dynip +from Milter.pyip6 import inet_ntop class AddrCacheTestCase(unittest.TestCase): @@ -48,6 +49,7 @@ def suite(): s = unittest.makeSuite(AddrCacheTestCase,'test') s.addTest(doctest.DocTestSuite(Milter.utils)) s.addTest(doctest.DocTestSuite(Milter.dynip)) + s.addTest(doctest.DocTestSuite(Milter.pyip6)) return s if __name__ == '__main__':