IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

small grammar fix in multibyte filename messages

Browse Source
This commit is contained in:
Georg Brandl 2013-10-01 19:50:32 +02:00
parent 33cd5e4978
commit 895899b7bb
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sphinx/cmdline.py
View File

@ -114,8 +114,8 @@ def main(argv):
return 1 return 1
except UnicodeError: except UnicodeError:
print >>sys.stderr, ( print >>sys.stderr, (
'Error: Multibyte filename did not support on this filesystem ' 'Error: Multibyte filename not supported on this filesystem '
'encoding: %s' % fs_encoding) 'encoding (%r).' % fs_encoding)
return 1 return 1
filenames = args[2:] filenames = args[2:]

4
sphinx/util/osutil.py
View File

@ -81,8 +81,8 @@ def walk(top, topdown=True, followlinks=False):
fullpath = path.join(top, name) fullpath = path.join(top, name)
except UnicodeError: except UnicodeError:
print >>sys.stderr, ( print >>sys.stderr, (
'%s:: ERROR: multibyte filename did not support on this filesystem ' '%s:: ERROR: multibyte filename not supported on this '
'encoding %r, skipped.' % (name, fs_encoding)) 'filesystem encoding %r, skipped.' % (name, fs_encoding))
continue continue
if path.isdir(fullpath): if path.isdir(fullpath):
dirs.append(name) dirs.append(name)

2
tests/test_build.py
View File

@ -81,7 +81,7 @@ def test_multibyte_path(app):
except UnicodeEncodeError: except UnicodeEncodeError:
from path import FILESYSTEMENCODING from path import FILESYSTEMENCODING
raise SkipTest( raise SkipTest(
'multibyte filename did not support on this filesystem encoding: ' 'multibyte filename not supported on this filesystem encoding: '
'%s', FILESYSTEMENCODING) '%s', FILESYSTEMENCODING)
(srcdir / mb_name / (mb_name + '.txt')).write_text(dedent(""" (srcdir / mb_name / (mb_name + '.txt')).write_text(dedent("""

2
tests/test_quickstart.py
View File

@ -118,7 +118,7 @@ def test_do_prompt_with_multibyte():
qs.do_prompt(d, 'k1', 'Q1', default=u'\u65e5\u672c') qs.do_prompt(d, 'k1', 'Q1', default=u'\u65e5\u672c')
except UnicodeEncodeError: except UnicodeEncodeError:
raise SkipTest( raise SkipTest(
'multibyte console input did not support on this encoding: %s', 'multibyte console input not supported on this encoding: %s',
qs.TERM_ENCODING) qs.TERM_ENCODING)
assert d['k1'] == u'\u30c9\u30a4\u30c4' assert d['k1'] == u'\u30c9\u30a4\u30c4'

2
tests/test_setup_command.py
View File

@ -67,7 +67,7 @@ def test_build_sphinx_with_multibyte_path(pkgroot, proc):
except UnicodeEncodeError: except UnicodeEncodeError:
from path import FILESYSTEMENCODING from path import FILESYSTEMENCODING
raise SkipTest( raise SkipTest(
'multibyte filename did not support on this filesystem encoding: ' 'multibyte filename not supported on this filesystem encoding: '
'%s', FILESYSTEMENCODING) '%s', FILESYSTEMENCODING)
(srcdir / mb_name / (mb_name + '.txt')).write_text(dedent(""" (srcdir / mb_name / (mb_name + '.txt')).write_text(dedent("""