Attachment 188504 Details for Bug 224067 – Proposed patch

[patch] Proposed patch

pya.diff (text/plain), 6.41 KB, created by Antoine Brodin on 2017-12-03 22:49:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2017-12-03 22:49:26 UTC

Size: 6.41 KB

patch

obsolete

>Index: devel/py-ipaddr/Makefile
>===================================================================
>--- devel/py-ipaddr/Makefile	(revision 455491)
>+++ devel/py-ipaddr/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ipaddr
>-PORTVERSION=	2.1.11
>+PORTVERSION=	2.2.0
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -11,9 +11,14 @@
> COMMENT=	Google open source IPv4/IPv6 manipulation library in Python
> 
> LICENSE=	APACHE20
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> NO_ARCH=	yes
> USES=		python
> USE_PYTHON=	distutils autoplist
>+TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
> 
>+do-test:
>+	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ipaddr_test.py)
>+
> .include <bsd.port.mk>
>Index: devel/py-ipaddr/distinfo
>===================================================================
>--- devel/py-ipaddr/distinfo	(revision 455491)
>+++ devel/py-ipaddr/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (ipaddr-2.1.11.tar.gz) = 1b555b8a8800134fdafe32b7d0cb52f5bdbfdd093707c3dd484c5ea59f1d98b7
>-SIZE (ipaddr-2.1.11.tar.gz) = 29046
>+TIMESTAMP = 1512302860
>+SHA256 (ipaddr-2.2.0.tar.gz) = 4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6
>+SIZE (ipaddr-2.2.0.tar.gz) = 26266
>Index: devel/py-ipaddr/files/patch-ipaddr.py
>===================================================================
>--- devel/py-ipaddr/files/patch-ipaddr.py	(revision 455491)
>+++ devel/py-ipaddr/files/patch-ipaddr.py	(nonexistent)
>@@ -1,23 +0,0 @@
>---- ipaddr.py.orig	2014-01-31 21:22:32 UTC
>-+++ ipaddr.py
>-@@ -25,6 +25,11 @@ and networks.
>- __version__ = '2.1.11'
>- 
>- import struct
>-+import sys
>-+
>-+if sys.version_info > (3,):
>-+    long = int
>-+    xrange = range
>- 
>- IPV4LENGTH = 32
>- IPV6LENGTH = 128
>-@@ -1447,7 +1452,7 @@ class _BaseV6(object):
>- 
>-         try:
>-             # Now, parse the hextets into a 128-bit integer.
>--            ip_int = 0L
>-+            ip_int = long(0)
>-             for i in xrange(parts_hi):
>-                 ip_int <<= 16
>-                 ip_int |= self._parse_hextet(parts[i])
>
>Property changes on: devel/py-ipaddr/files/patch-ipaddr.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/py-ipaddr/files/patch-ipaddr_test.py
>===================================================================
>--- devel/py-ipaddr/files/patch-ipaddr_test.py	(revision 455491)
>+++ devel/py-ipaddr/files/patch-ipaddr_test.py	(nonexistent)
>@@ -1,78 +0,0 @@
>---- ipaddr_test.py.orig	2016-01-05 00:38:35 UTC
>-+++ ipaddr_test.py
>-@@ -21,6 +21,10 @@
>- import unittest
>- import time
>- import ipaddr
>-+import sys
>-+
>-+if sys.version_info > (3,):
>-+    long = int
>- 
>- # Compatibility function to cast str to bytes objects
>- if issubclass(ipaddr.Bytes, str):
>-@@ -266,7 +270,7 @@ class IpaddrUnitTest(unittest.TestCase):
>-                          '2001:658:22a:cafe:200::1')
>- 
>-     def testGetNetmask(self):
>--        self.assertEqual(int(self.ipv4.netmask), 4294967040L)
>-+        self.assertEqual(int(self.ipv4.netmask), 4294967040)
>-         self.assertEqual(str(self.ipv4.netmask), '255.255.255.0')
>-         self.assertEqual(str(self.ipv4_hostmask.netmask), '255.0.0.0')
>-         self.assertEqual(int(self.ipv6.netmask),
>-@@ -283,7 +287,7 @@ class IpaddrUnitTest(unittest.TestCase):
>-         self.assertEqual(ipv6_zero_netmask._prefix_from_prefix_string('0'), 0)
>- 
>-     def testGetBroadcast(self):
>--        self.assertEqual(int(self.ipv4.broadcast), 16909311L)
>-+        self.assertEqual(int(self.ipv4.broadcast), 16909311)
>-         self.assertEqual(str(self.ipv4.broadcast), '1.2.3.255')
>- 
>-         self.assertEqual(int(self.ipv6.broadcast),
>-@@ -1100,9 +1104,9 @@ class IpaddrUnitTest(unittest.TestCase):
>- 
>-     def testNetworkElementCaching(self):
>-         # V4 - make sure we're empty
>--        self.assertFalse(self.ipv4._cache.has_key('network'))
>--        self.assertFalse(self.ipv4._cache.has_key('broadcast'))
>--        self.assertFalse(self.ipv4._cache.has_key('hostmask'))
>-+        self.assertFalse('network' in self.ipv4._cache)
>-+        self.assertFalse('broadcast' in self.ipv4._cache)
>-+        self.assertFalse('hostmask' in self.ipv4._cache)
>- 
>-         # V4 - populate and test
>-         self.assertEqual(self.ipv4.network, ipaddr.IPv4Address('1.2.3.0'))
>-@@ -1110,14 +1114,14 @@ class IpaddrUnitTest(unittest.TestCase):
>-         self.assertEqual(self.ipv4.hostmask, ipaddr.IPv4Address('0.0.0.255'))
>- 
>-         # V4 - check we're cached
>--        self.assertTrue(self.ipv4._cache.has_key('network'))
>--        self.assertTrue(self.ipv4._cache.has_key('broadcast'))
>--        self.assertTrue(self.ipv4._cache.has_key('hostmask'))
>-+        self.assertTrue('network' in self.ipv4._cache)
>-+        self.assertTrue('broadcast' in self.ipv4._cache)
>-+        self.assertTrue('hostmask' in self.ipv4._cache)
>- 
>-         # V6 - make sure we're empty
>--        self.assertFalse(self.ipv6._cache.has_key('network'))
>--        self.assertFalse(self.ipv6._cache.has_key('broadcast'))
>--        self.assertFalse(self.ipv6._cache.has_key('hostmask'))
>-+        self.assertFalse('network' in self.ipv6._cache)
>-+        self.assertFalse('broadcast' in self.ipv6._cache)
>-+        self.assertFalse('hostmask' in self.ipv6._cache)
>- 
>-         # V6 - populate and test
>-         self.assertEqual(self.ipv6.network,
>-@@ -1128,9 +1132,9 @@ class IpaddrUnitTest(unittest.TestCase):
>-                          ipaddr.IPv6Address('::ffff:ffff:ffff:ffff'))
>- 
>-         # V6 - check we're cached
>--        self.assertTrue(self.ipv6._cache.has_key('network'))
>--        self.assertTrue(self.ipv6._cache.has_key('broadcast'))
>--        self.assertTrue(self.ipv6._cache.has_key('hostmask'))
>-+        self.assertTrue('network' in self.ipv6._cache)
>-+        self.assertTrue('broadcast' in self.ipv6._cache)
>-+        self.assertTrue('hostmask' in self.ipv6._cache)
>- 
>-     def testTeredo(self):
>-         # stolen from wikipedia
>
>Property changes on: devel/py-ipaddr/files/patch-ipaddr_test.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 224067: 188504