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

[jwilk at users.alioth.debian.org]

    Date: Friday, September 2, 2011 @ 23:11:50
  Author: jwilk
Revision: 18427

New upstream release.

Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/series
Deleted:
  packages/python-docutils/trunk/debian/patches/test-error-reporting.diff
  packages/python-docutils/trunk/debian/patches/test-functional.diff

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-09-02 22:42:51 UTC (rev 18426)
+++ packages/python-docutils/trunk/debian/changelog	2011-09-02 23:11:50 UTC (rev 18427)
@@ -1,3 +1,11 @@
+python-docutils (0.8.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    + Drop test-error-reporting.diff and test-functional.diff (both applied
+      upstream)
+
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 03 Sep 2011 01:11:21 +0200
+
 python-docutils (0.8-1) experimental; urgency=low
 
   * New upstream release.

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2011-09-02 22:42:51 UTC (rev 18426)
+++ packages/python-docutils/trunk/debian/patches/series	2011-09-02 23:11:50 UTC (rev 18427)
@@ -3,6 +3,4 @@
 13_install_roman.diff
 15_emacs_debian_paths.diff
 emacs-sensible-browser.diff
-test-error-reporting.diff
-test-functional.diff
 move-data-to-usr-share.diff

Deleted: packages/python-docutils/trunk/debian/patches/test-error-reporting.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/test-error-reporting.diff	2011-09-02 22:42:51 UTC (rev 18426)
+++ packages/python-docutils/trunk/debian/patches/test-error-reporting.diff	2011-09-02 23:11:50 UTC (rev 18427)
@@ -1,25 +0,0 @@
-Description: Fix NameError exceptions in test_error_reporting.
-Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/test/test_functional.py?r1=7039&r2=7097
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3395887&group_id=38414&atid=422030
-Last-Update: 2011-08-22
-
---- a/test/test_error_reporting.py
-+++ b/test/test_error_reporting.py
-@@ -236,7 +236,7 @@
-     except UnicodeEncodeError:
-         try:
-             open(u'\xfc'.encode(sys.getfilesystemencoding(), 'replace'))
--        except IOError:
-+        except IOError, e:
-             uioe = e
-     try:
-         os.chdir(b('\xfc'))
-@@ -249,7 +249,7 @@
-     except UnicodeEncodeError:
-         try:
-             os.chdir(u'\xfc'.encode(sys.getfilesystemencoding(), 'replace'))
--        except OSError:
-+        except OSError, e:
-             uose = e
-     # wrapped test data:
-     wbioe = SafeString(bioe)

Deleted: packages/python-docutils/trunk/debian/patches/test-functional.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/test-functional.diff	2011-09-02 22:42:51 UTC (rev 18426)
+++ packages/python-docutils/trunk/debian/patches/test-functional.diff	2011-09-02 23:11:50 UTC (rev 18427)
@@ -1,15 +0,0 @@
-Description: Fix UnicodeDecodeError exceptions in test_functional.
-Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/test/test_functional.py?r1=7039&r2=7097
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3395887&group_id=38414&atid=422030
-Last-Update: 2011-08-22
-
---- a/test/test_functional.py
-+++ b/test/test_functional.py
-@@ -175,7 +175,6 @@
-             f = open(expected_path, 'r')
-         else: # samples are UTF8 encoded. 'rb' leads to errors with Python 3!
-             f = open(expected_path, 'r', encoding='utf-8')
--        f = open(expected_path, 'r')
-         # Normalize line endings:
-         expected = '\n'.join(f.read().splitlines())
-         f.close()