[Python-modules-commits] r11053 - in packages/python-docutils/trunk/debian/patches (1 file)

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

    Date: Friday, January 8, 2010 @ 10:41:27
  Author: jwilk-guest
Revision: 11053

Replace decode-path-none.diff with the one that was applied upstream.

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

Modified: packages/python-docutils/trunk/debian/patches/decode-path-none.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/decode-path-none.diff	2010-01-08 10:12:52 UTC (rev 11052)
+++ packages/python-docutils/trunk/debian/patches/decode-path-none.diff	2010-01-08 10:41:27 UTC (rev 11053)
@@ -1,20 +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>
+Origin: http://svn.berlios.de/viewcvs/docutils?view=rev&revision=6216
 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
+Last-Update: 2010-01-08
 
 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.
-     """
+--- python-docutils-0.6.orig/docutils/utils.py	2009-09-10 13:02:27.000000000 +0200
++++ python-docutils-0.6/docutils/utils.py	2010-01-08 11:40:23.000000000 +0100
+@@ -338,6 +338,8 @@
      # see also http://article.gmane.org/gmane.text.docutils.user/2905
-+    if path is None:
-+        return
      try:
          path = path.decode(sys.getfilesystemencoding(), 'strict')
++    except AttributeError: # default value None has no decode method
++        return nodes.reprunicode(path)
      except UnicodeDecodeError:
+         path = path.decode('utf-8', 'strict')
+         try: