| author | Danek Duvall <danek.duvall@oracle.com> |
| Wed, 20 Jan 2016 16:02:48 -0800 | |
| changeset 5301 | 668f8ba776f1 |
| parent 5295 | 5c98bff030f2 |
| permissions | -rw-r--r-- |
|
5295
5c98bff030f2
22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
This patch is pulled from upstream; once we pull in 2.1 or newer, it will |
|
5c98bff030f2
22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
no longer be necessary. |
|
5c98bff030f2
22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
|
|
5301
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
4 |
--- Pygments-1.6/pygments/formatters/img.py Sun Feb 3 01:26:49 2013 |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
5 |
+++ Pygments-1.6/pygments/formatters/img.py Wed Jan 20 13:33:20 2016 |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
6 |
@@ -15,6 +15,8 @@ |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
7 |
from pygments.util import get_bool_opt, get_int_opt, \ |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
8 |
get_list_opt, get_choice_opt |
|
5295
5c98bff030f2
22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
|
|
5301
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
10 |
+import subprocess |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
11 |
+ |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
12 |
# Import this carefully |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
13 |
try: |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
14 |
from PIL import Image, ImageDraw, ImageFont |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
15 |
@@ -72,11 +74,11 @@ |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
16 |
self._create_nix() |
|
5295
5c98bff030f2
22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
|
|
5c98bff030f2
22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
def _get_nix_font_path(self, name, style): |
|
5301
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
19 |
- from commands import getstatusoutput |
|
5295
5c98bff030f2
22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
20 |
- exit, out = getstatusoutput('fc-list "%s:style=%s" file' %
|
|
5c98bff030f2
22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
21 |
- (name, style)) |
|
5301
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
22 |
- if not exit: |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
23 |
- lines = out.splitlines() |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
24 |
+ proc = subprocess.Popen(['fc-list', "%s:style=%s" % (name, style), 'file'], |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
25 |
+ stdout=subprocess.PIPE, stderr=None) |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
26 |
+ stdout, _ = proc.communicate() |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
27 |
+ if proc.returncode == 0: |
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
28 |
+ lines = stdout.splitlines() |
|
5295
5c98bff030f2
22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
29 |
if lines: |
|
5301
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
30 |
path = lines[0].strip().strip(':')
|
|
668f8ba776f1
22364960 problem in PYTHON-MOD/PYGMENTS (fix python 2.x)
Danek Duvall <danek.duvall@oracle.com>
parents:
5295
diff
changeset
|
31 |
return path |