gnu: python-file: Drop outdated patch.

* gnu/local.mk: Remove python-file-double-encoding-bug.patch
* gnu/packages/patches/python-file-double-encoding-bug.patch: Delete file.
* gnu/packages/python.scm (python-file)[source]:
Remove "python-file-double-encoding-bug.patch".

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Sergei Trofimovich 2017-05-31 21:08:26 +01:00 committed by Danny Milosavljevic
parent facac29280
commit 9491227dcb
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
3 changed files with 0 additions and 55 deletions

View File

@ -927,7 +927,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-3.5-fix-tests.patch \ %D%/packages/patches/python-3.5-fix-tests.patch \
%D%/packages/patches/python-3.5-getentropy-on-old-kernels.patch \ %D%/packages/patches/python-3.5-getentropy-on-old-kernels.patch \
%D%/packages/patches/python-dendropy-fix-tests.patch \ %D%/packages/patches/python-dendropy-fix-tests.patch \
%D%/packages/patches/python-file-double-encoding-bug.patch \
%D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python-fix-tests.patch \
%D%/packages/patches/python-parse-too-many-fields.patch \ %D%/packages/patches/python-parse-too-many-fields.patch \
%D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \

View File

@ -1,50 +0,0 @@
Fix bug that breaks file's Python bindings when using Python 3. This patch
should not be applied when using Python 2.
Copied from upstream source repository:
https://github.com/file/file/commit/73e043d2a986234b187a00ed0c8d1f7bf83df372
From 73e043d2a986234b187a00ed0c8d1f7bf83df372 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Tue, 28 Jun 2016 17:10:22 +0000
Subject: [PATCH] PR/562: Reiner Herrmann: Avoid double encoding with python3
---
python/magic.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/python/magic.py b/python/magic.py
index c48f7d5..b0f7a17 100644
--- a/python/magic.py
+++ b/python/magic.py
@@ -134,7 +134,7 @@ class Magic(object):
if isinstance(r, str):
return r
else:
- return str(r).encode('utf-8')
+ return str(r, 'utf-8')
def descriptor(self, fd):
"""
@@ -152,7 +152,7 @@ class Magic(object):
if isinstance(r, str):
return r
else:
- return str(r).encode('utf-8')
+ return str(r, 'utf-8')
def error(self):
"""
@@ -163,7 +163,7 @@ class Magic(object):
if isinstance(e, str):
return e
else:
- return str(e).encode('utf-8')
+ return str(e, 'utf-8')
def setflags(self, flags):
"""
--
2.10.1

View File

@ -7578,10 +7578,6 @@ Python's @code{ctypes} foreign function interface (FFI).")
(package (package
(inherit file) (inherit file)
(name "python-file") (name "python-file")
(source (origin
(inherit (package-source file))
;; This patch should not be applied to python2-file.
(patches (search-patches "python-file-double-encoding-bug.patch"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:tests? #f ;no tests '(#:tests? #f ;no tests