[Python-modules-commits] [python-ipaddress] 01/03: Import python-ipaddress_1.0.15.orig.tar.gz

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository python-ipaddress.

commit bb9e15444e8e92bf2711012ec91fdc8a85574238
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Nov 14 00:12:00 2015 +0200

    Import python-ipaddress_1.0.15.orig.tar.gz
---
 PKG-INFO                    | 2 +-
 ipaddress.egg-info/PKG-INFO | 2 +-
 ipaddress.py                | 8 +++++++-
 setup.py                    | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index da7233b..4c88670 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ipaddress
-Version: 1.0.14
+Version: 1.0.15
 Summary: IPv4/IPv6 manipulation library
 Home-page: https://github.com/phihag/ipaddress
 Author: Philipp Hagemeister
diff --git a/ipaddress.egg-info/PKG-INFO b/ipaddress.egg-info/PKG-INFO
index da7233b..4c88670 100644
--- a/ipaddress.egg-info/PKG-INFO
+++ b/ipaddress.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ipaddress
-Version: 1.0.14
+Version: 1.0.15
 Summary: IPv4/IPv6 manipulation library
 Home-page: https://github.com/phihag/ipaddress
 Author: Philipp Hagemeister
diff --git a/ipaddress.py b/ipaddress.py
index a08eb74..27f0026 100644
--- a/ipaddress.py
+++ b/ipaddress.py
@@ -14,7 +14,7 @@ from __future__ import unicode_literals
 import itertools
 import struct
 
-__version__ = '1.0.14'
+__version__ = '1.0.15'
 
 # Compatibility functions
 _compat_int_types = (int,)
@@ -192,6 +192,12 @@ def ip_network(address, strict=True):
     except (AddressValueError, NetmaskValueError):
         pass
 
+    if isinstance(address, bytes):
+        raise AddressValueError(
+            '%r does not appear to be an IPv4 or IPv6 network. '
+            'Did you pass in a bytes (str in Python 2) instead of'
+            ' a unicode object?' % address)
+
     raise ValueError('%r does not appear to be an IPv4 or IPv6 network' %
                      address)
 
diff --git a/setup.py b/setup.py
index 2f67303..6e4da4f 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ except ImportError:
 
 settings = {
     'name': 'ipaddress',
-    'version': '1.0.14',
+    'version': '1.0.15',
     'description': 'IPv4/IPv6 manipulation library',
     'long_description': 'Port of the 3.3+ ipaddress module to 2.6, 2.7, 3.2',
     'author': 'Philipp Hagemeister',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-ipaddress.git