[Python-modules-commits] r23885 - in packages/sphinx/trunk/debian/patches (2 files)

[jwilk at users.alioth.debian.org]

    Date: Monday, April 8, 2013 @ 19:16:42
  Author: jwilk
Revision: 23885

Mark skiptest_latex.diff as forwarded upstream.

Modified:
  packages/sphinx/trunk/debian/patches/skiptest_latex.diff
Deleted:
  packages/sphinx/trunk/debian/patches/pygments_byte_strings.diff

Deleted: packages/sphinx/trunk/debian/patches/pygments_byte_strings.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/pygments_byte_strings.diff	2013-04-08 19:15:49 UTC (rev 23884)
+++ packages/sphinx/trunk/debian/patches/pygments_byte_strings.diff	2013-04-08 19:16:42 UTC (rev 23885)
@@ -1,19 +0,0 @@
-Description: fix Unicode issues in PygmentsBridge.highlight_block()
- In some circumstances pygments.highlight() returns a byte string instead of
- Unicode string. PygmentsBridge.highlight_block() does expect Unicode strings
- only, so convert such strings forcibly to Unicode.
-Bug-Debian: http://bugs.debian.org/660930
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/905/typeerror-expected-a-character-buffer
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-04-02
-
---- a/sphinx/highlighting.py
-+++ b/sphinx/highlighting.py
-@@ -210,6 +210,7 @@
-         try:
-             formatter = self.get_formatter(**kwargs)
-             hlsource = highlight(source, lexer, formatter)
-+            hlsource = unicode(hlsource)
-             if self.dest == 'html':
-                 return hlsource
-             else:

Modified: packages/sphinx/trunk/debian/patches/skiptest_latex.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/skiptest_latex.diff	2013-04-08 19:15:49 UTC (rev 23884)
+++ packages/sphinx/trunk/debian/patches/skiptest_latex.diff	2013-04-08 19:16:42 UTC (rev 23885)
@@ -3,7 +3,7 @@
  test_build_latex, raise SkipTest instead of just printing a message to stderr.
 Author: Jakub Wilk <jwilk at debian.org>
 Bug: https://bitbucket.org/birkenfeld/sphinx/issue/896/test_build_latex-could-use-skiptest
-Forwarded: no
+Forwarded: yes
 Last-Update: 2012-03-13
 
 --- a/tests/test_build_latex.py