1 files changed, 55 insertions, 0 deletions
diff --git a/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
new file mode 100644
index 000000000000..5ac64a256cb6
--- /dev/null
+++ b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
@@ -0,0 +1,55 @@
+Upstream: https://github.com/DiffSK/configobj/commit/e2731538d1a37a5b67a6e518848be6a8988043ae
+
+diff --git a/tests/test_validate.py b/tests/test_validate.py
+index bffb0dc..4eed7e9 100644
+--- a/tests/test_validate.py
++++ b/tests/test_validate.py
+@@ -161,3 +161,26 @@ class TestBasic(object):
+                     'test3': 3,
+                     'test4': 6.0
+         }}}
++
++
++class TestDottedQuadToNum(object):
++
++    def test_stripped(self):
++        assert dottedQuadToNum('192.0.2.0') == 3221225984
++        assert dottedQuadToNum('192.0.2.1 ') == 3221225985
++        assert dottedQuadToNum(' 192.0.2.2') == 3221225986
++        assert dottedQuadToNum('\t\t192.0.2.3\n') == 3221225987
++        with pytest.raises(ValueError) as excinfo:
++            dottedQuadToNum('192. 0. 2. 4')
++        assert str(excinfo.value) == 'Not a good dotted-quad IP: 192. 0. 2. 4'
++
++    def test_boundaries(self):
++        assert dottedQuadToNum('0.0.0.0') == 0
++        assert dottedQuadToNum('255.255.255.255') == 4294967295
++        with pytest.raises(ValueError) as excinfo:
++            dottedQuadToNum('255.255.255.256')
++        assert str(excinfo.value) == (
++            'Not a good dotted-quad IP: 255.255.255.256')
++        with pytest.raises(ValueError) as excinfo:
++            dottedQuadToNum('-1')
++        assert str(excinfo.value) == 'Not a good dotted-quad IP: -1'
+diff --git a/validate.py b/validate.py
+index b7a964c..9d8c94d 100644
+--- a/validate.py
++++ b/validate.py
+@@ -277,17 +277,8 @@ def dottedQuadToNum(ip):
+     
+     >>> int(dottedQuadToNum('1 '))
+     1
+-    >>> int(dottedQuadToNum(' 1.2'))
+-    16777218
+-    >>> int(dottedQuadToNum(' 1.2.3 '))
+-    16908291
+     >>> int(dottedQuadToNum('1.2.3.4'))
+     16909060
+-    >>> dottedQuadToNum('255.255.255.255')
+-    4294967295
+-    >>> dottedQuadToNum('255.255.255.256')
+-    Traceback (most recent call last):
+-    ValueError: Not a good dotted-quad IP: 255.255.255.256
+     """
+     
+     # import here to avoid it when ip_addr values are not used