[gentoo-commits] repo/gentoo:master commit in: dev-python/libnacl/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/libnacl/files/

[Mike Gilbert]

commit:     5ead3d318d88f12fb3db52bd9c714632229bf3af
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Dec 12 08:03:23 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 15:58:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ead3d31

dev-python/libnacl: remove unused patch(es)

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-python/libnacl/files/libnacl-1.7.1-py39.patch | 35 -----------------------
 1 file changed, 35 deletions(-)

diff --git a/dev-python/libnacl/files/libnacl-1.7.1-py39.patch b/dev-python/libnacl/files/libnacl-1.7.1-py39.patch
deleted file mode 100644
index 62fc1e30258..00000000000
--- a/dev-python/libnacl/files/libnacl-1.7.1-py39.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 53c1576b21b53156fc30d357b40c88c7eefb50de
-Author: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date:   Thu Jan 30 22:22:58 2020 +0530
-
-    Remove encoding parameter json.loads for Python 3.9 compatibility.
-
-diff --git a/libnacl/utils.py b/libnacl/utils.py
-index 412d518..e06e078 100644
---- a/libnacl/utils.py
-+++ b/libnacl/utils.py
-@@ -1,6 +1,7 @@
- # -*- coding: utf-8 -*-
- 
- import struct
-+import sys
- import time
- 
- # Import nacl libs
-@@ -31,7 +32,10 @@ def load_key(path_or_file, serial='json'):
-             key_data = msgpack.load(stream)
-         elif serial == 'json':
-             import json
--            key_data = json.loads(stream.read(), encoding='UTF-8')
-+            if sys.version_info[0] >= 3:
-+                key_data = json.loads(stream.read())
-+            else:
-+                key_data = json.loads(stream.read(), encoding='UTF-8')
-     finally:
-         if stream != path_or_file:
-             stream.close()
-@@ -95,4 +99,3 @@ def time_nonce():
-     '''
-     nonce = rand_nonce()
-     return (struct.pack('=d', time.time()) + nonce)[:len(nonce)]
--