Takayuki Shimizukawa avatar Takayuki Shimizukawa committed 5a6be3a

grammar fix: 'multibyte filename' is ambiguous. They are replaced with 'non-ASCII filename'. refs #703

Comments (0)

Files changed (7)

   a named target.
 * A wrong condition broke the search feature on first page that is usually
   index.rst.  This issue was introduced in 1.2b1.
-* #703: When Sphinx can't decode filenames with multibyte characters, Sphinx now
+* #703: When Sphinx can't decode filenames with non-ASCII characters, Sphinx now
   catches UnicodeError and will continue if possible instead of raising the
   exception.
 
 * #1189: "Title underline is too short" WARNING is given when using fullwidth
   characters to "Project name" on quickstart.
 * #1190: Output TeX/texinfo/man filename has no basename (only extension)
-  when using multibyte characters in the "Project name" on quickstart.
+  when using non-ASCII characters in the "Project name" on quickstart.
 * #1192: Fix escaping problem for hyperlinks in the manpage writer.
 * #1193: Fix i18n: multiple link references in the same line return the same
   link.

sphinx/util/osutil.py

             fullpath = path.join(top, name)
         except UnicodeError:
             print >>sys.stderr, (
-                '%s:: ERROR: multibyte filename not supported on this '
+                '%s:: ERROR: non-ASCII filename not supported on this '
                 'filesystem encoding %r, skipped.' % (name, fs_encoding))
             continue
         if path.isdir(fullpath):

tests/test_application.py

 
 
 @with_app()
-def test_emit_with_multibyte_name_node(app):
+def test_emit_with_nonascii_name_node(app):
     node = nodes.section(names=[u'\u65e5\u672c\u8a9e'])
     app.emit('my_event', node)
 

tests/test_build.py

     app.builder.build_all()
 
 @with_app(buildername='html', srcdir='(temp)')
-def test_multibyte_path(app):
+def test_nonascii_path(app):
     srcdir = path(app.srcdir)
     mb_name = u'\u65e5\u672c\u8a9e'
     try:
     except UnicodeEncodeError:
         from path import FILESYSTEMENCODING
         raise SkipTest(
-            'multibyte filename not supported on this filesystem encoding: '
+            'nonascii filename not supported on this filesystem encoding: '
             '%s', FILESYSTEMENCODING)
 
     (srcdir / mb_name / (mb_name + '.txt')).write_text(dedent("""

tests/test_build_text.py

 
 
 @with_text_app()
-def test_multibyte_title_line(app):
+def test_nonascii_title_line(app):
     title = u'\u65e5\u672c\u8a9e'
     underline = u'=' * column_width(title)
     content = u'\n'.join((title, underline, u''))
 
 
 @with_text_app()
-def test_multibyte_table(app):
+def test_nonascii_table(app):
     text = u'\u65e5\u672c\u8a9e'
     contents = (u"\n.. list-table::"
                  "\n"
 
 
 @with_text_app()
-def test_multibyte_maxwidth(app):
+def test_nonascii_maxwidth(app):
     sb_text = u'abc'  #length=3
     mb_text = u'\u65e5\u672c\u8a9e'  #length=3
 

tests/test_quickstart.py

     raises(AssertionError, qs.do_prompt, d, 'k6', 'Q6', validator=qs.boolean)
 
 
-def test_do_prompt_with_multibyte():
+def test_do_prompt_with_nonascii():
     d = {}
     answers = {
         'Q1': u'\u30c9\u30a4\u30c4',
         qs.do_prompt(d, 'k1', 'Q1', default=u'\u65e5\u672c')
     except UnicodeEncodeError:
         raise SkipTest(
-            'multibyte console input not supported on this encoding: %s',
+            'non-ASCII console input not supported on this encoding: %s',
             qs.TERM_ENCODING)
     assert d['k1'] == u'\u30c9\u30a4\u30c4'
 

tests/test_setup_command.py

 
 
 @with_setup_command(root)
-def test_build_sphinx_with_multibyte_path(pkgroot, proc):
+def test_build_sphinx_with_nonascii_path(pkgroot, proc):
     mb_name = u'\u65e5\u672c\u8a9e'
     srcdir = (pkgroot / 'doc')
     try:
     except UnicodeEncodeError:
         from path import FILESYSTEMENCODING
         raise SkipTest(
-            'multibyte filename not supported on this filesystem encoding: '
+            'non-ASCII filename not supported on this filesystem encoding: '
             '%s', FILESYSTEMENCODING)
 
     (srcdir / mb_name / (mb_name + '.txt')).write_text(dedent("""
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.