summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2009-06-01 17:43:35 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2009-06-01 17:43:35 (GMT)
commit1ae35ea1d613ed6e01cbca20f08342393cadb663 (patch)
tree73bc918307bd0ab25129b68abb3f4a02ccc90bac
parent3dd3388229995e00cf0ba858700576a79de0d6ec (diff)
downloadcpython-1ae35ea1d613ed6e01cbca20f08342393cadb663.zip
cpython-1ae35ea1d613ed6e01cbca20f08342393cadb663.tar.gz
cpython-1ae35ea1d613ed6e01cbca20f08342393cadb663.tar.bz2
Merged revisions 73109 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73109 | gregory.p.smith | 2009-06-01 10:40:41 -0700 (Mon, 01 Jun 2009) | 6 lines Sync up __version__ number with the version of the ipaddr-py project this library came from that it matches. ........
-rw-r--r--Lib/ipaddr.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/ipaddr.py b/Lib/ipaddr.py
index e6b26e0..96000af 100644
--- a/Lib/ipaddr.py
+++ b/Lib/ipaddr.py
@@ -1,5 +1,6 @@
# Copyright 2007 Google Inc.
# Licensed to PSF under a Contributor Agreement.
+#
# See also: http://code.google.com/p/ipaddr-py/
"""An IPv4/IPv6 manipulation library in Python.
@@ -9,7 +10,7 @@ and prefixes.
"""
-__version__ = '1.0.2'
+__version__ = '1.1.0'
import struct