diff options
| author | Georg Brandl <georg@python.org> | 2013-10-01 19:50:32 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-01 19:50:32 +0200 |
| commit | 895899b7bb53c3e60371e46b9fee056b116b7b2f (patch) | |
| tree | fc57e16917e0c8d34e2f18f491af138835714e94 | |
| parent | 33cd5e497895a3d0d197043db5fac6d0ed59fb70 (diff) | |
| download | sphinx-git-895899b7bb53c3e60371e46b9fee056b116b7b2f.tar.gz | |
small grammar fix in multibyte filename messages
| -rw-r--r-- | sphinx/cmdline.py | 4 | ||||
| -rw-r--r-- | sphinx/util/osutil.py | 4 | ||||
| -rw-r--r-- | tests/test_build.py | 2 | ||||
| -rw-r--r-- | tests/test_quickstart.py | 2 | ||||
| -rw-r--r-- | tests/test_setup_command.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py index a9dc9fc85..987f30051 100644 --- a/sphinx/cmdline.py +++ b/sphinx/cmdline.py @@ -114,8 +114,8 @@ def main(argv): return 1 except UnicodeError: print >>sys.stderr, ( - 'Error: Multibyte filename did not support on this filesystem ' - 'encoding: %s' % fs_encoding) + 'Error: Multibyte filename not supported on this filesystem ' + 'encoding (%r).' % fs_encoding) return 1 filenames = args[2:] diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py index 3128b9c78..6ed366d4e 100644 --- a/sphinx/util/osutil.py +++ b/sphinx/util/osutil.py @@ -81,8 +81,8 @@ def walk(top, topdown=True, followlinks=False): fullpath = path.join(top, name) except UnicodeError: print >>sys.stderr, ( - '%s:: ERROR: multibyte filename did not support on this filesystem ' - 'encoding %r, skipped.' % (name, fs_encoding)) + '%s:: ERROR: multibyte filename not supported on this ' + 'filesystem encoding %r, skipped.' % (name, fs_encoding)) continue if path.isdir(fullpath): dirs.append(name) diff --git a/tests/test_build.py b/tests/test_build.py index 4f6ba259e..0a17e862c 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -81,7 +81,7 @@ def test_multibyte_path(app): except UnicodeEncodeError: from path import FILESYSTEMENCODING raise SkipTest( - 'multibyte filename did not support on this filesystem encoding: ' + 'multibyte filename not supported on this filesystem encoding: ' '%s', FILESYSTEMENCODING) (srcdir / mb_name / (mb_name + '.txt')).write_text(dedent(""" diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py index 55ede6e3c..d14af696a 100644 --- a/tests/test_quickstart.py +++ b/tests/test_quickstart.py @@ -118,7 +118,7 @@ def test_do_prompt_with_multibyte(): qs.do_prompt(d, 'k1', 'Q1', default=u'\u65e5\u672c') except UnicodeEncodeError: raise SkipTest( - 'multibyte console input did not support on this encoding: %s', + 'multibyte console input not supported on this encoding: %s', qs.TERM_ENCODING) assert d['k1'] == u'\u30c9\u30a4\u30c4' diff --git a/tests/test_setup_command.py b/tests/test_setup_command.py index 6f0050d68..51653460b 100644 --- a/tests/test_setup_command.py +++ b/tests/test_setup_command.py @@ -67,7 +67,7 @@ def test_build_sphinx_with_multibyte_path(pkgroot, proc): except UnicodeEncodeError: from path import FILESYSTEMENCODING raise SkipTest( - 'multibyte filename did not support on this filesystem encoding: ' + 'multibyte filename not supported on this filesystem encoding: ' '%s', FILESYSTEMENCODING) (srcdir / mb_name / (mb_name + '.txt')).write_text(dedent(""" |