diff options
author | lethalman <lucabru@src.gnome.org> | 2015-01-21 10:54:27 +0100 |
---|---|---|
committer | lethalman <lucabru@src.gnome.org> | 2015-01-21 10:54:27 +0100 |
commit | 7cad64a13d3a167f49f1be76fb9369af1f51fddf (patch) | |
tree | 37f51a392b52232bd800b7933a0f30b6ab80e0b7 /pkgs/development/python-modules | |
parent | b214a6ab72b14f59688b208440106ca34ab26cc6 (diff) | |
parent | f4bcecbda4b823f6b421128a2a42d6e60692b03b (diff) | |
download | nixlib-7cad64a13d3a167f49f1be76fb9369af1f51fddf.tar nixlib-7cad64a13d3a167f49f1be76fb9369af1f51fddf.tar.gz nixlib-7cad64a13d3a167f49f1be76fb9369af1f51fddf.tar.bz2 nixlib-7cad64a13d3a167f49f1be76fb9369af1f51fddf.tar.lz nixlib-7cad64a13d3a167f49f1be76fb9369af1f51fddf.tar.xz nixlib-7cad64a13d3a167f49f1be76fb9369af1f51fddf.tar.zst nixlib-7cad64a13d3a167f49f1be76fb9369af1f51fddf.zip |
Merge pull request #5856 from rycee/update/pyacoustid
Fix build of 'pyacoustid' under Python 3.
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/pyacoustid-py3.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/pyacoustid-py3.patch b/pkgs/development/python-modules/pyacoustid-py3.patch new file mode 100644 index 000000000000..f79b35fd345e --- /dev/null +++ b/pkgs/development/python-modules/pyacoustid-py3.patch @@ -0,0 +1,32 @@ +From 19209469a709ec0914f82c9de23137e360e5e804 Mon Sep 17 00:00:00 2001 +From: Simon Chopin <chopin.simon@gmail.com> +Date: Mon, 29 Sep 2014 10:38:20 +0200 +Subject: [PATCH] Explicit the UTF-8 encoding also when installing using Python + 3 + +If the locale isn't UTF-8, or for some reason Python doesn't pick up on +it, it will try to decode using ASCII, which will of course cause +mayhem, crash and despair. + +This patch will be shipped with the Debian package 1.1.0-1 +--- + setup.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index eafe5ea..0732fe3 100644 +--- a/setup.py ++++ b/setup.py +@@ -18,9 +18,10 @@ + + def _read(fn): + path = os.path.join(os.path.dirname(__file__), fn) +- data = open(path).read() + if sys.version_info[0] < 3: +- data = data.decode('utf8') ++ data = open(path).read().decode('utf8') ++ else: ++ data = open(path, encoding='utf8').read() + # Special case some Unicode characters; PyPI seems to only like ASCII. + data = data.replace(u'\xe1', u'a') + data = data.replace(u'\u0161', u's') |