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

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

    Date: Tuesday, August 6, 2013 @ 16:14:13
  Author: mitya57-guest
Revision: 25413

Updated rst2odt_prepstyles-elementtree.diff to make it not cause
SyntaxErrors with Python 3.

Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/rst2odt_prepstyles-elementtree.diff

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2013-08-05 23:31:41 UTC (rev 25412)
+++ packages/python-docutils/trunk/debian/changelog	2013-08-06 16:14:13 UTC (rev 25413)
@@ -1,8 +1,13 @@
 python-docutils (0.11-2) UNRELEASED; urgency=low
 
+  [ Michael Schutte ]
   * Document in the patch header that #714313 is also taken care of by
     odt-writer-ascii-filenames.diff.
 
+  [ Dmitry Shachnev ]
+  * Updated rst2odt_prepstyles-elementtree.diff to make it not cause
+    SyntaxErrors with Python 3.
+
  -- Michael Schutte <michi at debian.org>  Mon, 05 Aug 2013 16:56:38 +0200
 
 python-docutils (0.11-1) experimental; urgency=low

Modified: packages/python-docutils/trunk/debian/patches/rst2odt_prepstyles-elementtree.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/rst2odt_prepstyles-elementtree.diff	2013-08-05 23:31:41 UTC (rev 25412)
+++ packages/python-docutils/trunk/debian/patches/rst2odt_prepstyles-elementtree.diff	2013-08-06 16:14:13 UTC (rev 25413)
@@ -4,7 +4,7 @@
 Bug-Debian: http://bugs.debian.org/714319
 Author: Michael Schutte <michi at debian.org>
 Forwarded: https://sourceforge.net/p/docutils/patches/114/
-Last-Update: 2013-08-05
+Last-Update: 2013-08-06
 
 --- a/tools/rst2odt_prepstyles.py
 +++ b/tools/rst2odt_prepstyles.py
@@ -15,10 +15,10 @@
 -from lxml import etree
 +try:
 +    from xml.etree import ElementTree as etree
-+except ImportError, e:
++except ImportError:
 +    try:
 +        from elementtree import ElementTree as etree
-+    except ImportError, e:
++    except ImportError:
 +        raise ImportError('Missing an implementation of ElementTree. ' \
 +                'Please install either Python >= 2.5 or ElementTree.')
 +