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

[jwilk at users.alioth.debian.org]

    Date: Wednesday, April 25, 2012 @ 16:29:31
  Author: jwilk
Revision: 21430

Update move-data-to-usr-share.diff to cover the test/ directory, too.

Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2012-04-25 11:34:13 UTC (rev 21429)
+++ packages/python-docutils/trunk/debian/changelog	2012-04-25 16:29:31 UTC (rev 21430)
@@ -1,3 +1,9 @@
+python-docutils (0.8.1-7) UNRELEASED; urgency=low
+
+  * Update move-data-to-usr-share.diff to cover the test/ directory, too.
+
+ -- Jakub Wilk <jwilk at debian.org>  Wed, 25 Apr 2012 18:28:27 +0200
+
 python-docutils (0.8.1-6) unstable; urgency=low
 
   * Fix a typo in a patch description.

Modified: packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff	2012-04-25 11:34:13 UTC (rev 21429)
+++ packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff	2012-04-25 16:29:31 UTC (rev 21430)
@@ -127,3 +127,22 @@
 +else:
 +    def _datadir(path):
 +        return os.path.dirname(path)
+--- a/test/test_parsers/test_rst/test_directives/test_include.py
++++ b/test/test_parsers/test_rst/test_directives/test_include.py
+@@ -11,6 +11,7 @@
+ import os.path
+ import sys
+ from __init__ import DocutilsTestSupport
++import docutils
+ from docutils.parsers.rst import states
+ from docutils._compat import b
+ 
+@@ -41,7 +42,7 @@
+     utf_16_error_str = ("UnicodeError: Unable to decode input data.  "
+                         "Tried the following encodings: 'ascii'.\n"
+                         "            (%s)" % utf_16_error_str)
+-nonexistent = os.path.join(os.path.dirname(states.__file__),
++nonexistent = os.path.join(docutils._datadir(states.__file__),
+                            'include', 'nonexistent')
+ nonexistent_rel = DocutilsTestSupport.utils.relative_path(
+     os.path.join(DocutilsTestSupport.testroot, 'dummy'), nonexistent)