[Python-checkins] r66396 - in doctools/trunk: sphinx/ext/__init__.py sphinx/util/_json.py sphinx/util/json.py tests/root/conf.py tests/test_build.py tests/test_env.py

[georg.brandl]

Author: georg.brandl
Date: Fri Sep 12 00:14:34 2008
New Revision: 66396

Log:
Fix nits.


Modified:
   doctools/trunk/sphinx/ext/__init__.py
   doctools/trunk/sphinx/util/_json.py
   doctools/trunk/sphinx/util/json.py
   doctools/trunk/tests/root/conf.py
   doctools/trunk/tests/test_build.py
   doctools/trunk/tests/test_env.py

Modified: doctools/trunk/sphinx/ext/__init__.py
==============================================================================
--- doctools/trunk/sphinx/ext/__init__.py	(original)
+++ doctools/trunk/sphinx/ext/__init__.py	Fri Sep 12 00:14:34 2008
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    sphinx.addons
-    ~~~~~~~~~~~~~
+    sphinx.ext
+    ~~~~~~~~~~
 
     Contains Sphinx features not activated by default.
 

Modified: doctools/trunk/sphinx/util/_json.py
==============================================================================
--- doctools/trunk/sphinx/util/_json.py	(original)
+++ doctools/trunk/sphinx/util/_json.py	Fri Sep 12 00:14:34 2008
@@ -11,7 +11,7 @@
 
     Uses the basestring encode function from simplejson.
 
-    :copyright: Copyright 2008 by Armin Ronacher, Bob Ippolito.
+    :copyright: 2008 by Armin Ronacher, Bob Ippolito.
     :license: BSD.
 """
 import re

Modified: doctools/trunk/sphinx/util/json.py
==============================================================================
--- doctools/trunk/sphinx/util/json.py	(original)
+++ doctools/trunk/sphinx/util/json.py	Fri Sep 12 00:14:34 2008
@@ -5,7 +5,7 @@
 
     This module imports JSON functions from various locations.
 
-    :copyright: Copyright 2008 by Armin Ronacher.
+    :copyright: 2008 by Armin Ronacher.
     :license: BSD.
 """
 

Modified: doctools/trunk/tests/root/conf.py
==============================================================================
--- doctools/trunk/tests/root/conf.py	(original)
+++ doctools/trunk/tests/root/conf.py	Fri Sep 12 00:14:34 2008
@@ -149,7 +149,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
 latex_documents = [
-  ('contents', 'SphinxTests.tex', 'Sphinx Tests Documentation', 'Georg Brandl', 'manual'),
+  ('contents', 'SphinxTests.tex', 'Sphinx Tests Documentation',
+   'Georg Brandl', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

Modified: doctools/trunk/tests/test_build.py
==============================================================================
--- doctools/trunk/tests/test_build.py	(original)
+++ doctools/trunk/tests/test_build.py	Fri Sep 12 00:14:34 2008
@@ -28,7 +28,8 @@
 ENV_WARNINGS = """\
 WARNING: %(root)s/images.txt:9: Image file not readable: foo.png
 WARNING: %(root)s/images.txt:20: Nonlocal image URI found: http://www.python.org/logo.png
-WARNING: %(root)s/includes.txt:: (WARNING/2) Encoding 'utf-8' used for reading included file u'wrongenc.inc' seems to be wrong, try giving an :encoding: option
+WARNING: %(root)s/includes.txt:: (WARNING/2) Encoding 'utf-8' used for reading included \
+file u'wrongenc.inc' seems to be wrong, try giving an :encoding: option
 """
 
 HTML_WARNINGS = ENV_WARNINGS + """\

Modified: doctools/trunk/tests/test_env.py
==============================================================================
--- doctools/trunk/tests/test_env.py	(original)
+++ doctools/trunk/tests/test_env.py	Fri Sep 12 00:14:34 2008
@@ -61,7 +61,8 @@
     latexbuilder = LaTeXBuilder(app, env)
     latexbuilder.post_process_images(tree)
     assert "no matching candidate for image URI u'foo.*'" in app._warning.content[-1]
-    assert set(latexbuilder.images.keys()) == set(['subdir/img.png', 'img.png', 'img.pdf'])
+    assert set(latexbuilder.images.keys()) == set(['subdir/img.png',
+                                                   'img.png', 'img.pdf'])
     assert set(latexbuilder.images.values()) == set(['img.pdf', 'img.png', 'img1.png'])
 
 def test_second_update():