Sync up __version__ number with the version of the ipaddr-py project this

library came from that it matches.

Remove the former apache license text now that its been contributed to PSF to
avoid confusion.

diff --git a/Lib/ipaddr.py b/Lib/ipaddr.py
index 7289e456e43964901e059e445d8fd4db456c8eea..b04a4b8b7d8fa19fe750871c289d9757466410e5 100644 (file)
--- a/Lib/ipaddr.py
+++ b/Lib/ipaddr.py
@@ -1,18 +1,6 @@
 # Copyright 2007 Google Inc.
 #  Licensed to PSF under a Contributor Agreement.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
 # See also: http://code.google.com/p/ipaddr-py/
 
 """An IPv4/IPv6 manipulation library in Python.
@@ -22,7 +10,7 @@ and prefixes.
 
 """
 
-__version__ = '1.0.2'
+__version__ = '1.1.0'
 
 import struct