Fix long lines.

This commit is contained in:
Georg Brandl 2014-03-02 08:40:48 +01:00
parent c68104b1be
commit 501c2d13e6
6 changed files with 22 additions and 13 deletions

View File

@ -55,7 +55,7 @@ using :meth:`.Sphinx.add_directive` or :meth:`.Sphinx.add_directive_to_domain`.
.. attribute:: arguments .. attribute:: arguments
The arguments given to the directive, as a list. The arguments given to the directive, as a list.
.. attribute:: options .. attribute:: options
The options given to the directive, as a dictionary mapping option names The options given to the directive, as a dictionary mapping option names
@ -82,7 +82,7 @@ using :meth:`.Sphinx.add_directive` or :meth:`.Sphinx.add_directive_to_domain`.
Internal offset of the directive content. Used when calling Internal offset of the directive content. Used when calling
``nested_parse`` (see below). ``nested_parse`` (see below).
.. attribute:: block_text .. attribute:: block_text
The string containing the entire directive. The string containing the entire directive.

View File

@ -294,5 +294,5 @@ There is `sphinx translation page`_ for Sphinx-1.2 documentation.
.. _`transifex-client`: https://pypi.python.org/pypi/transifex-client .. _`transifex-client`: https://pypi.python.org/pypi/transifex-client
.. _`sphinx-intl`: https://pypi.python.org/pypi/sphinx-intl .. _`sphinx-intl`: https://pypi.python.org/pypi/sphinx-intl
.. _Transifex: https://www.transifex.com/ .. _Transifex: https://www.transifex.com/
.. _`sphinx translation page`: https://www.transifex.com/projects/p/sphinx-doc-1_2_0/ .. _`sphinx translation page`: https://www.transifex.com/projects/p/sphinx-doc-1_2_0/
.. _`Transifex Client v0.8 — Transifex documentation`: http://help.transifex.com/features/client/index.html .. _`Transifex Client v0.8 — Transifex documentation`: http://help.transifex.com/features/client/index.html

View File

@ -56,7 +56,8 @@ class Catalog(object):
def add(self, msg, origin): def add(self, msg, origin):
if not hasattr(origin, 'uid'): if not hasattr(origin, 'uid'):
# Nodes that are replicated like todo don't have a uid, however i18n is also unnecessary. # Nodes that are replicated like todo don't have a uid,
# however i18n is also unnecessary.
return return
if msg not in self.metadata: # faster lookup in hash if msg not in self.metadata: # faster lookup in hash
self.messages.append(msg) self.messages.append(msg)

View File

@ -49,7 +49,8 @@ BUILDERS = [
("", "xml", "to make Docutils-native XML files"), ("", "xml", "to make Docutils-native XML files"),
("", "pseudoxml", "to make pseudoxml-XML files for display purposes"), ("", "pseudoxml", "to make pseudoxml-XML files for display purposes"),
("", "linkcheck", "to check all external links for integrity"), ("", "linkcheck", "to check all external links for integrity"),
("", "doctest", "to run all doctests embedded in the documentation (if enabled)"), ("", "doctest", "to run all doctests embedded in the documentation "
"(if enabled)"),
("", "coverage", "to run coverage check of the documentation (if enabled)"), ("", "coverage", "to run coverage check of the documentation (if enabled)"),
] ]
@ -97,7 +98,8 @@ class Make(object):
if self.run_generic_build('singlehtml') > 0: if self.run_generic_build('singlehtml') > 0:
return 1 return 1
print print
print 'Build finished. The HTML page is in %s.' % self.builddir_join('singlehtml') print 'Build finished. The HTML page is in %s.' % \
self.builddir_join('singlehtml')
def build_pickle(self): def build_pickle(self):
if self.run_generic_build('pickle') > 0: if self.run_generic_build('pickle') > 0:
@ -126,7 +128,8 @@ class Make(object):
'.qhcp project file in %s, like this:') % self.builddir_join('qthelp') '.qhcp project file in %s, like this:') % self.builddir_join('qthelp')
print '$ qcollectiongenerator %s.qhcp' % self.builddir_join('qthelp', proj_name) print '$ qcollectiongenerator %s.qhcp' % self.builddir_join('qthelp', proj_name)
print 'To view the help file:' print 'To view the help file:'
print '$ assistant -collectionFile %s.qhc' % self.builddir_join('qthelp', proj_name) print '$ assistant -collectionFile %s.qhc' % \
self.builddir_join('qthelp', proj_name)
def build_devhelp(self): def build_devhelp(self):
if self.run_generic_build('devhelp') > 0: if self.run_generic_build('devhelp') > 0:
@ -172,7 +175,8 @@ class Make(object):
def build_texinfo(self): def build_texinfo(self):
if self.run_generic_build('texinfo') > 0: if self.run_generic_build('texinfo') > 0:
return 1 return 1
print "Build finished; the Texinfo files are in %s." % self.builddir_join('texinfo') print "Build finished; the Texinfo files are in %s." % \
self.builddir_join('texinfo')
if os.name == 'posix': if os.name == 'posix':
print "Run `make' in that directory to run these through makeinfo" print "Run `make' in that directory to run these through makeinfo"
print "(use `make info' here to do that automatically)." print "(use `make info' here to do that automatically)."
@ -187,13 +191,15 @@ class Make(object):
if self.run_generic_build('gettext', doctreedir=dtdir) > 0: if self.run_generic_build('gettext', doctreedir=dtdir) > 0:
return 1 return 1
print print
print 'Build finished. The message catalogs are in %s.' % self.builddir_join('gettext') print 'Build finished. The message catalogs are in %s.' % \
self.builddir_join('gettext')
def build_changes(self): def build_changes(self):
if self.run_generic_build('changes') > 0: if self.run_generic_build('changes') > 0:
return 1 return 1
print print
print 'Build finished. The overview file is in %s.' % self.builddir_join('changes') print 'Build finished. The overview file is in %s.' % \
self.builddir_join('changes')
def build_linkcheck(self): def build_linkcheck(self):
res = self.run_generic_build('linkcheck') res = self.run_generic_build('linkcheck')
@ -226,7 +232,8 @@ class Make(object):
if self.run_generic_build('pseudoxml') > 0: if self.run_generic_build('pseudoxml') > 0:
return 1 return 1
print print
print 'Build finished. The pseudo-XML files are in %s.' % self.builddir_join('pseudoxml') print 'Build finished. The pseudo-XML files are in %s.' % \
self.builddir_join('pseudoxml')
def run_generic_build(self, builder, doctreedir=None): def run_generic_build(self, builder, doctreedir=None):
# compatibility with old Makefile # compatibility with old Makefile

View File

@ -58,7 +58,8 @@ def extract_messages(doctree):
# this issue was filed to Docutils tracker: # this issue was filed to Docutils tracker:
# sf.net/tracker/?func=detail&aid=3599485&group_id=38414&atid=422032 # sf.net/tracker/?func=detail&aid=3599485&group_id=38414&atid=422032
# sourceforge.net/p/docutils/patches/108/ # sourceforge.net/p/docutils/patches/108/
if isinstance(node, (nodes.caption, nodes.title, nodes.rubric)) and not node.source: if isinstance(node, (nodes.caption, nodes.title, nodes.rubric)) \
and not node.source:
node.source = find_source_node(node) node.source = find_source_node(node)
node.line = 0 #need fix docutils to get `node.line` node.line = 0 #need fix docutils to get `node.line`

View File

@ -62,7 +62,7 @@ if sys.version_info < (3, 0):
def check_style_and_encoding(fn, lines): def check_style_and_encoding(fn, lines):
encoding = 'ascii' encoding = 'ascii'
for lno, line in enumerate(lines): for lno, line in enumerate(lines):
if len(line) > 81: if len(line) > 90:
yield lno+1, "line too long" yield lno+1, "line too long"
if lno < 2: if lno < 2:
co = coding_re.search(line) co = coding_re.search(line)