| 1 |
commit: 1df3cf378b95f59d76c98bfca0f23648cbabce2b |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 4 08:34:28 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 4 08:34:28 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df3cf37 |
| 7 |
|
| 8 |
dev-python/pygments: Fix byte decoding in py3 |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564478 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.25 |
| 13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-python/pygments/files/2.0.2-bytes-decode.patch | 16 ++++++++++++++++ |
| 16 |
...pygments-2.0.2-r1.ebuild => pygments-2.0.2-r2.ebuild} | 1 + |
| 17 |
2 files changed, 17 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-python/pygments/files/2.0.2-bytes-decode.patch b/dev-python/pygments/files/2.0.2-bytes-decode.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..35f2e26 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-python/pygments/files/2.0.2-bytes-decode.patch |
| 24 |
@@ -0,0 +1,16 @@ |
| 25 |
+ pygments/formatters/img.py | 2 +- |
| 26 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 27 |
+ |
| 28 |
+diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py |
| 29 |
+index db5bee3..12d53cd 100644 |
| 30 |
+--- a/pygments/formatters/img.py |
| 31 |
++++ b/pygments/formatters/img.py |
| 32 |
+@@ -84,7 +84,7 @@ class FontManager(object): |
| 33 |
+ if not exit: |
| 34 |
+ lines = out.splitlines() |
| 35 |
+ if lines: |
| 36 |
+- path = lines[0].strip().strip(':') |
| 37 |
++ path = lines[0].decode().strip().strip(':') |
| 38 |
+ return path |
| 39 |
+ |
| 40 |
+ def _create_nix(self): |
| 41 |
|
| 42 |
diff --git a/dev-python/pygments/pygments-2.0.2-r1.ebuild b/dev-python/pygments/pygments-2.0.2-r2.ebuild |
| 43 |
similarity index 97% |
| 44 |
rename from dev-python/pygments/pygments-2.0.2-r1.ebuild |
| 45 |
rename to dev-python/pygments/pygments-2.0.2-r2.ebuild |
| 46 |
index b2de015..adef7af 100644 |
| 47 |
--- a/dev-python/pygments/pygments-2.0.2-r1.ebuild |
| 48 |
+++ b/dev-python/pygments/pygments-2.0.2-r2.ebuild |
| 49 |
@@ -36,6 +36,7 @@ S="${WORKDIR}/${MY_P}" |
| 50 |
PATCHES=( |
| 51 |
"${FILESDIR}"/${PV}-shell-injection-backport.patch |
| 52 |
"${FILESDIR}"/${PV}-shell-injection-backport2.patch |
| 53 |
+ "${FILESDIR}"/${PV}-bytes-decode.patch |
| 54 |
) |
| 55 |
|
| 56 |
python_compile_all() { |
Archives