|
From: <mi...@us...> - 2021-11-18 10:12:51
|
Revision: 8892
http://sourceforge.net/p/docutils/code/8892
Author: milde
Date: 2021-11-18 10:12:49 +0000 (Thu, 18 Nov 2021)
Log Message:
-----------
Fixup for [r8891]. Fix bug #434.
utils.get_stylesheet_list() must return POSIX paths.
Don't use hard-coded Windows drive letters in the tests.
Fix `bytes` test sample for utils.decode_path().
Modified Paths:
--------------
trunk/docutils/docutils/utils/__init__.py
trunk/docutils/test/test_utils.py
trunk/docutils/test/test_writers/test_html4css1_template.py
trunk/docutils/test/test_writers/test_s5.py
Modified: trunk/docutils/docutils/utils/__init__.py
===================================================================
--- trunk/docutils/docutils/utils/__init__.py 2021-11-17 19:04:15 UTC (rev 8891)
+++ trunk/docutils/docutils/utils/__init__.py 2021-11-18 10:12:49 UTC (rev 8892)
@@ -529,6 +529,8 @@
# expand relative paths if found in stylesheet-dirs:
stylesheets = [find_file_in_dirs(path, settings.stylesheet_dirs)
for path in stylesheets]
+ if os.sep != '/': # for URLs, we need POSIX paths
+ stylesheets = [path.replace(os.sep, '/') for path in stylesheets]
return stylesheets
def find_file_in_dirs(path, dirs):
Modified: trunk/docutils/test/test_utils.py
===================================================================
--- trunk/docutils/test/test_utils.py 2021-11-17 19:04:15 UTC (rev 8891)
+++ trunk/docutils/test/test_utils.py 2021-11-18 10:12:49 UTC (rev 8892)
@@ -281,13 +281,14 @@
self.assertEqual(utils.column_width(u'dâ'), 2) # combining
def test_decode_path(self):
- strpath = utils.decode_path('späm')
+ bytes_filename = u'späm'.encode(sys.getfilesystemencoding())
+ bytespath = utils.decode_path(bytes_filename)
unipath = utils.decode_path(u'späm')
defaultpath = utils.decode_path(None)
- self.assertEqual(strpath, u'späm')
+ self.assertEqual(bytespath, u'späm')
self.assertEqual(unipath, u'späm')
self.assertEqual(defaultpath, u'')
- self.assertTrue(isinstance(strpath, nodes.reprunicode))
+ self.assertTrue(isinstance(bytespath, nodes.reprunicode))
self.assertTrue(isinstance(unipath, unicode))
self.assertTrue(isinstance(defaultpath, unicode))
self.assertRaises(ValueError, utils.decode_path, 13)
Modified: trunk/docutils/test/test_writers/test_html4css1_template.py
===================================================================
--- trunk/docutils/test/test_writers/test_html4css1_template.py 2021-11-17 19:04:15 UTC (rev 8891)
+++ trunk/docutils/test/test_writers/test_html4css1_template.py 2021-11-18 10:12:49 UTC (rev 8892)
@@ -27,10 +27,12 @@
return s
if platform.system() == "Windows":
- drive_prefix = "C:"
+ drive_prefix = os.path.splitdrive(os.getcwd())[0]
else:
drive_prefix = ""
+
+
totest = {}
totest['template'] = [
Modified: trunk/docutils/test/test_writers/test_s5.py
===================================================================
--- trunk/docutils/test/test_writers/test_s5.py 2021-11-17 19:04:15 UTC (rev 8891)
+++ trunk/docutils/test/test_writers/test_s5.py 2021-11-18 10:12:49 UTC (rev 8892)
@@ -31,8 +31,8 @@
'version': DocutilsTestSupport.docutils.__version__,
'drive': '', }
-if platform.system() == "Windows":
- interpolations['drive'] = "C:"
+if platform.system() == 'Windows':
+ interpolations['drive'] = os.path.splitdrive(os.getcwd())[0]
totest_1 = {}
totest_2 = {}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|