diff options
author | Robert Helgesson <robert@rycee.net> | 2015-01-19 18:42:23 +0100 |
---|---|---|
committer | Robert Helgesson <robert@rycee.net> | 2015-01-19 18:42:23 +0100 |
commit | f4bcecbda4b823f6b421128a2a42d6e60692b03b (patch) | |
tree | 393a3a128ef3f9d361e42f7d9c52cf0a1eaed028 /pkgs/development/python-modules/pyacoustid-py3.patch | |
parent | 1e0d2a96b393a32d6a1997e3274238a255f59e5c (diff) | |
download | nixlib-f4bcecbda4b823f6b421128a2a42d6e60692b03b.tar nixlib-f4bcecbda4b823f6b421128a2a42d6e60692b03b.tar.gz nixlib-f4bcecbda4b823f6b421128a2a42d6e60692b03b.tar.bz2 nixlib-f4bcecbda4b823f6b421128a2a42d6e60692b03b.tar.lz nixlib-f4bcecbda4b823f6b421128a2a42d6e60692b03b.tar.xz nixlib-f4bcecbda4b823f6b421128a2a42d6e60692b03b.tar.zst nixlib-f4bcecbda4b823f6b421128a2a42d6e60692b03b.zip |
Fix build of 'pyacoustid' under Python 3.
Diffstat (limited to 'pkgs/development/python-modules/pyacoustid-py3.patch')
-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') |