public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pygments/files/, dev-python/pygments/
Date: Fri,  4 Dec 2015 08:34:38 +0000 (UTC)	[thread overview]
Message-ID: <1449218068.1df3cf378b95f59d76c98bfca0f23648cbabce2b.jlec@gentoo> (raw)

commit:     1df3cf378b95f59d76c98bfca0f23648cbabce2b
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 08:34:28 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 08:34:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df3cf37

dev-python/pygments: Fix byte decoding in py3

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564478

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/pygments/files/2.0.2-bytes-decode.patch       | 16 ++++++++++++++++
 ...pygments-2.0.2-r1.ebuild => pygments-2.0.2-r2.ebuild} |  1 +
 2 files changed, 17 insertions(+)

diff --git a/dev-python/pygments/files/2.0.2-bytes-decode.patch b/dev-python/pygments/files/2.0.2-bytes-decode.patch
new file mode 100644
index 0000000..35f2e26
--- /dev/null
+++ b/dev-python/pygments/files/2.0.2-bytes-decode.patch
@@ -0,0 +1,16 @@
+ pygments/formatters/img.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py
+index db5bee3..12d53cd 100644
+--- a/pygments/formatters/img.py
++++ b/pygments/formatters/img.py
+@@ -84,7 +84,7 @@ class FontManager(object):
+         if not exit:
+             lines = out.splitlines()
+             if lines:
+-                path = lines[0].strip().strip(':')
++                path = lines[0].decode().strip().strip(':')
+                 return path
+ 
+     def _create_nix(self):

diff --git a/dev-python/pygments/pygments-2.0.2-r1.ebuild b/dev-python/pygments/pygments-2.0.2-r2.ebuild
similarity index 97%
rename from dev-python/pygments/pygments-2.0.2-r1.ebuild
rename to dev-python/pygments/pygments-2.0.2-r2.ebuild
index b2de015..adef7af 100644
--- a/dev-python/pygments/pygments-2.0.2-r1.ebuild
+++ b/dev-python/pygments/pygments-2.0.2-r2.ebuild
@@ -36,6 +36,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PV}-shell-injection-backport.patch
 	"${FILESDIR}"/${PV}-shell-injection-backport2.patch
+	"${FILESDIR}"/${PV}-bytes-decode.patch
 )
 
 python_compile_all() {


             reply	other threads:[~2015-12-04  8:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-04  8:34 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-05-31  7:28 [gentoo-commits] repo/gentoo:master commit in: dev-python/pygments/files/, dev-python/pygments/ Michał Górny
2020-03-28 17:44 Michał Górny
2018-07-12 22:26 Michał Górny
2015-10-30 12:04 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449218068.1df3cf378b95f59d76c98bfca0f23648cbabce2b.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox