1 |
rafaelmartins 11/07/30 04:39:43 |
2 |
|
3 |
Added: rst2pdf-0.16_docutils-0.8.patch |
4 |
Log: |
5 |
Revision bump. Fixed runtime errors when using >=docutils-0.8 (bug #369943). |
6 |
|
7 |
(Portage version: 2.2.0_alpha46/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-python/rst2pdf/files/rst2pdf-0.16_docutils-0.8.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/rst2pdf/files/rst2pdf-0.16_docutils-0.8.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/rst2pdf/files/rst2pdf-0.16_docutils-0.8.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: rst2pdf-0.16_docutils-0.8.patch |
16 |
=================================================================== |
17 |
Index: rst2pdf/createpdf.py |
18 |
=================================================================== |
19 |
--- rst2pdf/createpdf.py (revision 2441) |
20 |
+++ rst2pdf/createpdf.py (working copy) |
21 |
@@ -56,6 +56,7 @@ |
22 |
from optparse import OptionParser |
23 |
import logging |
24 |
|
25 |
+import docutils |
26 |
from docutils.languages import get_language |
27 |
import docutils.readers.doctree |
28 |
import docutils.core |
29 |
@@ -97,6 +98,12 @@ |
30 |
escape=tenjin.helpers.escape |
31 |
templateEngine=tenjin.Engine() |
32 |
|
33 |
+# fix get_language for docutils>=0.8 |
34 |
+if docutils.__version__ >= '0.8': |
35 |
+ orig_func = get_language |
36 |
+ def get_language(arg1): |
37 |
+ return orig_func(arg1, None) |
38 |
+ |
39 |
def renderTemplate(tname, **context): |
40 |
context['to_str']=to_str |
41 |
context['escape']=escape |
42 |
Index: rst2pdf/pdfbuilder.py |
43 |
=================================================================== |
44 |
--- rst2pdf/pdfbuilder.py (revision 2441) |
45 |
+++ rst2pdf/pdfbuilder.py (working copy) |
46 |
@@ -27,6 +27,7 @@ |
47 |
from rst2pdf import pygments_code_block_directive, oddeven_directive |
48 |
from pygments.lexers import get_lexer_by_name, guess_lexer |
49 |
|
50 |
+import docutils |
51 |
from docutils import writers |
52 |
from docutils import nodes |
53 |
from docutils import languages |
54 |
@@ -56,7 +57,14 @@ |
55 |
|
56 |
from traceback import print_exc |
57 |
|
58 |
+# fix get_language for docutils>=0.8 |
59 |
+if docutils.__version__ >= '0.8': |
60 |
+ orig_func = get_language |
61 |
+ def get_language(arg1): |
62 |
+ return orig_func(arg1, None) |
63 |
+ languages.get_language = get_language |
64 |
|
65 |
+ |
66 |
class PDFBuilder(Builder): |
67 |
name = 'pdf' |
68 |
out_suffix = '.pdf' |