summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2016-02-26 10:08:48 +0100
committerGeorg Brandl <georg@python.org>2016-02-26 10:08:48 +0100
commite48b387113e036192110c91e4e347cd21828a7cc (patch)
tree684f582c3d256f6a7c958a76b9b9c20029ee1aeb
parentc58a8a0879ab2fb2bef47d632c360c34c52a62d1 (diff)
downloadpygments-e48b387113e036192110c91e4e347cd21828a7cc.tar.gz
Fixed Python 3 regression in image formatter (closes #1215)
-rw-r--r--CHANGES6
-rw-r--r--pygments/formatters/img.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index fbe7bc3b..ca921fc7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,12 @@ Issue numbers refer to the tracker at
pull request numbers to the requests at
<https://bitbucket.org/birkenfeld/pygments-main/pull-requests/merged>.
+Version 2.1.2
+-------------
+(in development)
+
+- Fixed Python 3 regression in image formatter (#1215)
+
Version 2.1.1
-------------
diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py
index c7b8e819..cc95ce24 100644
--- a/pygments/formatters/img.py
+++ b/pygments/formatters/img.py
@@ -83,7 +83,7 @@ class FontManager(object):
if proc.returncode == 0:
lines = stdout.splitlines()
for line in lines:
- if line.startswith('Fontconfig warning:'):
+ if line.startswith(b'Fontconfig warning:'):
continue
path = line.decode().strip().strip(':')
if path: