|
diff -ur Sphinx-1.1.2-py2.6.egg-orig//sphinx/cmdline.py Sphinx-1.1.2-py2.6.egg//sphinx/cmdline.py |
|
--- Sphinx-1.1.2-py2.6.egg-orig//sphinx/cmdline.py 2012-02-20 14:26:49.875362700 +0900 |
|
+++ Sphinx-1.1.2-py2.6.egg//sphinx/cmdline.py 2012-02-20 14:35:30.986942800 +0900 |
|
@@ -65,7 +65,7 @@ |
|
try: |
|
opts, args = getopt.getopt(argv[1:], 'ab:t:d:c:CD:A:ng:NEqQWw:P') |
|
allopts = set(opt[0] for opt in opts) |
|
- srcdir = confdir = path.abspath(args[0]) |
|
+ srcdir = confdir = unicode(path.abspath(args[0]), sys.getfilesystemencoding()) |
|
if not path.isdir(srcdir): |
|
print >>sys.stderr, 'Error: Cannot find source directory.' |
|
return 1 |
|
@@ -74,7 +74,7 @@ |
|
print >>sys.stderr, ('Error: Source directory doesn\'t ' |
|
'contain conf.py file.') |
|
return 1 |
|
- outdir = path.abspath(args[1]) |
|
+ outdir = unicode(path.abspath(args[1]), sys.getfilesystemencoding()) |
|
if not path.isdir(outdir): |
|
print >>sys.stderr, 'Making output directory...' |
|
os.makedirs(outdir) |
|
Files Sphinx-1.1.2-py2.6.egg-orig//sphinx/cmdline.pyc and Sphinx-1.1.2-py2.6.egg//sphinx/cmdline.pyc differ |
|
diff -ur Sphinx-1.1.2-py2.6.egg-orig//sphinx/config.py Sphinx-1.1.2-py2.6.egg//sphinx/config.py |
|
--- Sphinx-1.1.2-py2.6.egg-orig//sphinx/config.py 2012-02-20 14:26:49.898364000 +0900 |
|
+++ Sphinx-1.1.2-py2.6.egg//sphinx/config.py 2012-02-20 14:34:51.096914000 +0900 |
|
@@ -186,7 +186,7 @@ |
|
self.values = Config.config_values.copy() |
|
config = {} |
|
if dirname is not None: |
|
- config_file = path.join(dirname, filename) |
|
+ config_file = path.join(dirname.encode(sys.getfilesystemencoding()), filename) |
|
config['__file__'] = config_file |
|
config['tags'] = tags |
|
olddir = os.getcwd() |
|
Files Sphinx-1.1.2-py2.6.egg-orig//sphinx/config.pyc and Sphinx-1.1.2-py2.6.egg//sphinx/config.pyc differ |
|
diff -ur Sphinx-1.1.2-py2.6.egg-orig//sphinx/environment.py Sphinx-1.1.2-py2.6.egg//sphinx/environment.py |
|
--- Sphinx-1.1.2-py2.6.egg-orig//sphinx/environment.py 2012-02-20 14:26:49.843360800 +0900 |
|
+++ Sphinx-1.1.2-py2.6.egg//sphinx/environment.py 2012-02-20 14:34:28.923749000 +0900 |
|
@@ -461,7 +461,7 @@ |
|
elif base is None: |
|
return docname + suffix |
|
else: |
|
- return path.join(base, docname) + suffix |
|
+ return path.join(base, docname.encode(sys.getfilesystemencoding())) + suffix |
|
|
|
def relfn2path(self, filename, docname=None): |
|
"""Return paths to a file referenced from a document, relative to |
|
@@ -1315,7 +1315,7 @@ |
|
|
|
def _entries_from_toctree(toctreenode, separate=False, subtree=False): |
|
"""Return TOC entries for a toctree node.""" |
|
- refs = [(e[0], str(e[1])) for e in toctreenode['entries']] |
|
+ refs = [(e[0], e[1]) for e in toctreenode['entries']] |
|
entries = [] |
|
for (title, ref) in refs: |
|
try: |
|
Files Sphinx-1.1.2-py2.6.egg-orig//sphinx/environment.pyc and Sphinx-1.1.2-py2.6.egg//sphinx/environment.pyc differ |