[Python-modules-commits] r15328 - in packages/matplotlib/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Thursday, January 13, 2011 @ 22:46:38
  Author: morph
Revision: 15328

* debian/patches/60_doc_output_format.patch
  - obtain the documentation output format even if the value is a unicode (as
    returned by recent sphinx)

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

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2011-01-13 22:09:21 UTC (rev 15327)
+++ packages/matplotlib/trunk/debian/changelog	2011-01-13 22:46:38 UTC (rev 15328)
@@ -24,8 +24,11 @@
     - don't separate param and its argument with a space, new sphinx consider
       the first argument as the type; thanks to Jakub Wilk for the report;
       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)
 
- -- Sandro Tosi <morph at debian.org>  Thu, 13 Jan 2011 21:51:43 +0100
+ -- Sandro Tosi <morph at debian.org>  Thu, 13 Jan 2011 23:43:23 +0100
 
 matplotlib (0.99.3-1) unstable; urgency=low
 

Added: packages/matplotlib/trunk/debian/patches/60_doc_output_format.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/60_doc_output_format.patch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/60_doc_output_format.patch	2011-01-13 22:46:38 UTC (rev 15328)
@@ -0,0 +1,15 @@
+Description: obtain output format information even if it's a unicode string
+
+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
+@@ -346,7 +346,7 @@
+         del options['nofigs']
+ 
+     formats = setup.config.plot_formats
+-    if type(formats) == str:
++    if type(formats) in [str, unicode]:
+         formats = eval(formats)
+ 
+     fname = os.path.basename(plot_path)

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2011-01-13 22:09:21 UTC (rev 15327)
+++ packages/matplotlib/trunk/debian/patches/series	2011-01-13 22:46:38 UTC (rev 15328)
@@ -1,3 +1,4 @@
+60_doc_output_format.patch
 50_bts608942_spaces_in_param_args.patch
 40_bts608939_draw_markers_description.patch
 10_build_fix.patch