correct the initial checked in version

Author: pmoody

OWNERS

@@ -1,4 +1 @@
 pmoody
-harro
-mshields
-smart

README

@@ -1,7 +1,8 @@
-ipaddr.py is a library for working with IP addresses, both IPv4 and IPv6.
-It was developed by Google for internal use, and is now open source.
+ipaddress.py is a library for working with IP addresses, both IPv4 and IPv6.
+It was developed by Google for internal use, and is now open source. ipaddress
+was initially based on ipaddr.
 
-Project home page: http://code.google.com/p/ipaddr-py/
+Project home page: http://code.google.com/p/ipaddress-py/
 
 Please send contributions to [email protected].  Code should
 include unit tests and follow the Google Python style guide:

ipaddr.py renamed to ipaddress.py

@@ -22,7 +22,7 @@
 
 """
 
-__version__ = 'branches/3144'
+__version__ = '2.1.10'
 
 import struct
 
@@ -433,7 +433,7 @@ def get_mixed_type_key(obj):
         IPv4Address('1.1.1.1') <= IPv4Network('1.1.1.1/24')
 
     doesn't make any sense.  There are some times however, where you may wish
-    to have ipaddr sort these for you anyway. If you need to do this, you
+    to have ipaddress sort these for you anyway. If you need to do this, you
     can use this function as the key= argument to sorted().
 
     Args:
@@ -448,7 +448,7 @@ def get_mixed_type_key(obj):
         return obj._get_address_key()
     return NotImplemented
 
-class _IPAddrBase(object):
+class _IPAddressBase(object):
 
     """The mother class."""
 
@@ -472,7 +472,7 @@ def compressed(self):
         return str(self)
 
 
-class _BaseAddress(_IPAddrBase):
+class _BaseAddress(_IPAddressBase):
 
     """A generic IP object.
 
@@ -562,7 +562,7 @@ def version(self):
         raise NotImplementedError('BaseIP has no version')
 
 
-class _BaseInterface(_IPAddrBase):
+class _BaseInterface(_IPAddressBase):
 
     """A generic IP object.
 
@@ -1237,7 +1237,7 @@ def __init__(self, address):
                 IPv4Address('192.168.1.1')
 
         Raises:
-            AddressValueError: If ipaddr isn't a valid IPv4 address.
+            AddressValueError: If ipaddressisn't a valid IPv4 address.
 
         """
         _BaseAddress.__init__(self, address)
@@ -1309,7 +1309,7 @@ def __init__(self, address):
                 IPv4Interface('192.168.1.1')
 
         Raises:
-            AddressValueError: If ipaddr isn't a valid IPv4 address.
+            AddressValueError: If ipaddressisn't a valid IPv4 address.
             NetmaskValueError: If the netmask isn't valid for
               an IPv4 address.
             ValueError: If strict was True and a network address was not