[Python-modules-commits] r10921 - in packages/python-docutils/trunk/debian (3 files)

[jwilk-guest at users.alioth.debian.org]

    Date: Wednesday, December 30, 2009 @ 19:38:52
  Author: jwilk-guest
Revision: 10921

Fix the docutils.utils.decode_path() function so that it accepts None as
an argument (closes: #563087).

Added:
  packages/python-docutils/trunk/debian/patches/decode-path-none.diff
Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/series

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2009-12-30 18:03:27 UTC (rev 10920)
+++ packages/python-docutils/trunk/debian/changelog	2009-12-30 19:38:52 UTC (rev 10921)
@@ -5,6 +5,8 @@
   * Add Depends: ${misc:Depends}.
   * Point to versioned symlink in /usr/share/common-licenses for the GPL
     license.
+  * Fix the docutils.utils.decode_path() function so that it accepts None as
+    an argument (closes: #563087).
 
  -- Jakub Wilk <ubanus at users.sf.net>  Wed, 16 Dec 2009 14:13:56 +0100
 

Added: packages/python-docutils/trunk/debian/patches/decode-path-none.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/decode-path-none.diff	                        (rev 0)
+++ packages/python-docutils/trunk/debian/patches/decode-path-none.diff	2009-12-30 19:38:52 UTC (rev 10921)
@@ -0,0 +1,20 @@
+Description: Fix the docutils.utils.decode_path() function so that it accepts
+ None as an argument.
+Author: Jakub Wilk <ubanus at users.sf.net>
+Bug: http://sourceforge.net/tracker/?func=detail&aid=2923723&group_id=38414&atid=422030
+Bug-Debian: http://bugs.debian.org/563087
+Last-Update: 2009-12-30
+
+Index: python-docutils-0.6/docutils/utils.py
+===================================================================
+--- python-docutils-0.6.orig/docutils/utils.py	2009-12-30 19:30:33.000000000 +0100
++++ python-docutils-0.6/docutils/utils.py	2009-12-30 19:32:10.000000000 +0100
+@@ -336,6 +336,8 @@
+     implicit 'ascii:strict' decoding.
+     """
+     # see also http://article.gmane.org/gmane.text.docutils.user/2905
++    if path is None:
++        return
+     try:
+         path = path.decode(sys.getfilesystemencoding(), 'strict')
+     except UnicodeDecodeError:

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2009-12-30 18:03:27 UTC (rev 10920)
+++ packages/python-docutils/trunk/debian/patches/series	2009-12-30 19:38:52 UTC (rev 10921)
@@ -6,3 +6,4 @@
 15_emacs_debian_paths.diff
 16_disable_picins.diff
 17_revert_buildhtml.diff
+decode-path-none.diff