[Python-modules-commits] r15330 - in packages/matplotlib/trunk/debian (2 files)

[morph at users.alioth.debian.org]

    Date: Thursday, January 13, 2011 @ 22:58:42
  Author: morph
Revision: 15330

    returned by recent sphinx); thanks to Jakub Wilk for the tip on IRC

Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/60_doc_output_format.patch

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2011-01-13 22:56:49 UTC (rev 15329)
+++ packages/matplotlib/trunk/debian/changelog	2011-01-13 22:58:42 UTC (rev 15330)
@@ -26,9 +26,9 @@
       Closes: #608942
   * debian/patches/60_doc_output_format.patch
     - obtain the documentation output format even if the value is a unicode (as
-      returned by recent sphinx)
+      returned by recent sphinx); thanks to Jakub Wilk for the tip on IRC
 
- -- Sandro Tosi <morph at debian.org>  Thu, 13 Jan 2011 23:43:23 +0100
+ -- Sandro Tosi <morph at debian.org>  Thu, 13 Jan 2011 23:58:12 +0100
 
 matplotlib (0.99.3-1) unstable; urgency=low
 

Modified: packages/matplotlib/trunk/debian/patches/60_doc_output_format.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/60_doc_output_format.patch	2011-01-13 22:56:49 UTC (rev 15329)
+++ packages/matplotlib/trunk/debian/patches/60_doc_output_format.patch	2011-01-13 22:58:42 UTC (rev 15330)
@@ -2,14 +2,14 @@
 
 Index: matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py
 ===================================================================
---- matplotlib-1.0.1.orig/lib/matplotlib/sphinxext/plot_directive.py	2011-01-13 23:42:02.014683116 +0100
-+++ matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py	2011-01-13 23:35:25.410183132 +0100
+--- matplotlib-1.0.1.orig/lib/matplotlib/sphinxext/plot_directive.py	2011-01-06 14:48:13.000000000 +0100
++++ matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py	2011-01-13 23:50:58.838682411 +0100
 @@ -346,7 +346,7 @@
          del options['nofigs']
  
      formats = setup.config.plot_formats
 -    if type(formats) == str:
-+    if type(formats) in [str, unicode]:
++    if isinstance(formats, basestring):
          formats = eval(formats)
  
      fname = os.path.basename(plot_path)