added absolute path of test root to sys.path because Py21/Py22 insert the

*relative* path "test" at the beginning of sys.path when running
"python2.2 test/alltests.py", which breaks the imports due to chdir;
replaced os.path.sep with os.sep for Py21/Py22 compatibility

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@4220 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

2 files changed, 3 insertions, 2 deletions

diff --git a/docutils/docutils/writers/s5_html/__init__.py b/docutils/docutils/writers/s5_html/__init__.py
index bd776cb6a..c63631d92 100644
--- a/docutils/docutils/writers/s5_html/__init__.py
+++ b/docutils/docutils/writers/s5_html/__init__.py
@@ -252,7 +252,7 @@ class S5HTMLTranslator(html4css1.HTMLTranslator):
                 src_data = src_file.read()
                 src_file.close()
                 dest_file = open(dest, 'wb')
-                dest_dir = dest_dir.replace(os.path.sep, '/')
+                dest_dir = dest_dir.replace(os.sep, '/')
                 dest_file.write(src_data.replace(
                     'ui/default', dest_dir[dest_dir.rfind('ui/'):]))
                 dest_file.close()
diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py
index 758b86454..c3c0aa2a2 100644
--- a/docutils/test/DocutilsTestSupport.py
+++ b/docutils/test/DocutilsTestSupport.py
@@ -46,7 +46,8 @@ import os
 
 testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
 os.chdir(testroot)
-sys.path.insert(1, os.path.normpath(os.path.join(testroot, '..')))
+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+sys.path.insert(0, testroot)
 sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
 
 import unittest