diff options
author | Kyle Manna | 2016-01-11 08:10:45 -0800 |
---|---|---|
committer | Kyle Manna | 2016-01-11 08:48:02 -0800 |
commit | dfe4d5e5985864ca48c82f2fa41e6801a9731eb5 (patch) | |
tree | 98bdffc1412394d2275dc4b84c630bbc01acef48 | |
parent | a602a98dbc77c4865419466828d7016e274cbe6c (diff) | |
download | aur-dfe4d5e5985864ca48c82f2fa41e6801a9731eb5.tar.gz |
release: v0.5-5 continue fixing Python 3 issues
* Not sure that this works.
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | 0001-storage-Python-3-fix-for-izip.patch | 2 | ||||
-rw-r--r-- | 0002-storage-Python-3-fix-for-imap.patch | 2 | ||||
-rw-r--r-- | 0003-storage-Python-3-fix-for-zope.interface.patch | 2 | ||||
-rw-r--r-- | 0004-node-Python-3-fix-for-long.patch | 27 | ||||
-rw-r--r-- | PKGBUILD | 1 |
6 files changed, 32 insertions, 4 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Mon Jan 11 16:33:16 UTC 2016 +# Mon Jan 11 16:47:59 UTC 2016 pkgbase = python-kademlia pkgdesc = Distributed hash table for decentralized peer-to-peer computer networks pkgver = 0.5 diff --git a/0001-storage-Python-3-fix-for-izip.patch b/0001-storage-Python-3-fix-for-izip.patch index eaf92509747b..1d7d06298fd9 100644 --- a/0001-storage-Python-3-fix-for-izip.patch +++ b/0001-storage-Python-3-fix-for-izip.patch @@ -1,7 +1,7 @@ From 2b8bc2209ef356feabf6cd60ab7abbc54a99018b Mon Sep 17 00:00:00 2001 From: Kyle Manna <kyle@kylemanna.com> Date: Mon, 11 Jan 2016 08:23:16 -0800 -Subject: [PATCH 1/3] storage: Python 3 fix for izip +Subject: [PATCH 1/4] storage: Python 3 fix for izip * Work with both. --- diff --git a/0002-storage-Python-3-fix-for-imap.patch b/0002-storage-Python-3-fix-for-imap.patch index 7b03f383d755..95811ffcf056 100644 --- a/0002-storage-Python-3-fix-for-imap.patch +++ b/0002-storage-Python-3-fix-for-imap.patch @@ -1,7 +1,7 @@ From c71a3700ac264cd62ac2e58cbab1a422d292f0a6 Mon Sep 17 00:00:00 2001 From: Kyle Manna <kyle@kylemanna.com> Date: Mon, 11 Jan 2016 08:23:16 -0800 -Subject: [PATCH 2/3] storage: Python 3 fix for imap +Subject: [PATCH 2/4] storage: Python 3 fix for imap * Work with both. --- diff --git a/0003-storage-Python-3-fix-for-zope.interface.patch b/0003-storage-Python-3-fix-for-zope.interface.patch index b45e0bc66a51..92a3ce0c050a 100644 --- a/0003-storage-Python-3-fix-for-zope.interface.patch +++ b/0003-storage-Python-3-fix-for-zope.interface.patch @@ -1,7 +1,7 @@ From e531f28468255d5559898e3c353dd514773aebfd Mon Sep 17 00:00:00 2001 From: Kyle Manna <kyle@kylemanna.com> Date: Mon, 11 Jan 2016 08:23:16 -0800 -Subject: [PATCH 3/3] storage: Python 3 fix for zope.interface +Subject: [PATCH 3/4] storage: Python 3 fix for zope.interface * Work with both. --- diff --git a/0004-node-Python-3-fix-for-long.patch b/0004-node-Python-3-fix-for-long.patch new file mode 100644 index 000000000000..a4c189e659fe --- /dev/null +++ b/0004-node-Python-3-fix-for-long.patch @@ -0,0 +1,27 @@ +From 70cbcb2a6bbed46feba4850afca6aefb6909b6d5 Mon Sep 17 00:00:00 2001 +From: Kyle Manna <kyle@kylemanna.com> +Date: Mon, 11 Jan 2016 08:23:16 -0800 +Subject: [PATCH 4/4] node: Python 3 fix for long() + +* Work with both. +* https://docs.python.org/3/whatsnew/3.0.html#integers +--- + kademlia/node.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kademlia/node.py b/kademlia/node.py +index d1b25f7..90b3bb2 100644 +--- a/kademlia/node.py ++++ b/kademlia/node.py +@@ -7,7 +7,7 @@ class Node: + self.id = id + self.ip = ip + self.port = port +- self.long_id = long(id.encode('hex'), 16) ++ self.long_id = int(id.encode('hex'), 16) + + def sameHomeAs(self, node): + return self.ip == node.ip and self.port == node.port +-- +2.7.0 + @@ -17,6 +17,7 @@ build() { patch -p1 < "$srcdir/../0001-storage-Python-3-fix-for-izip.patch" patch -p1 < "$srcdir/../0002-storage-Python-3-fix-for-imap.patch" patch -p1 < "$srcdir/../0003-storage-Python-3-fix-for-zope.interface.patch" + patch -p1 < "$srcdir/../0004-node-Python-3-fix-for-long.patch" python setup.py build } |