[Zodb-checkins] SVN: zdaemon/branches/py3/src/zdaemon/tests/tests.py Fix import ordering and weird doctest indentation.

Marius Gedminas cvs-admin at zope.org
Thu Feb 14 15:33:35 UTC 2013


Log message for revision 129412:
  Fix import ordering and weird doctest indentation.

Changed:
  U   zdaemon/branches/py3/src/zdaemon/tests/tests.py

-=-
Modified: zdaemon/branches/py3/src/zdaemon/tests/tests.py
===================================================================
--- zdaemon/branches/py3/src/zdaemon/tests/tests.py	2013-02-14 15:33:33 UTC (rev 129411)
+++ zdaemon/branches/py3/src/zdaemon/tests/tests.py	2013-02-14 15:33:35 UTC (rev 129412)
@@ -12,10 +12,8 @@
 #
 ##############################################################################
 from __future__ import print_function
+
 import doctest
-import manuel.capture
-import manuel.doctest
-import manuel.testing
 import os
 import re
 import shutil
@@ -23,7 +21,11 @@
 import sys
 import tempfile
 import unittest
+
 import ZConfig
+import manuel.capture
+import manuel.doctest
+import manuel.testing
 import zc.customdoctests
 import zdaemon
 from zope.testing import renormalizing
@@ -38,6 +40,7 @@
     zdaemon_loc = os.path.dirname(os.path.dirname(zdaemon.__file__))
     zconfig_loc = os.path.dirname(os.path.dirname(ZConfig.__file__))
 
+
 def write(name, text):
     with open(name, 'w') as f:
         f.write(text)
@@ -46,6 +49,7 @@
     with open(name) as f:
         return f.read()
 
+
 def make_sure_non_daemon_mode_doesnt_hang_when_program_exits():
     """
     The whole awhile bit that waits for a program to start
@@ -84,12 +88,11 @@
 
 def allow_duplicate_arguments():
     """
+    Wrapper scripts will often embed configuration arguments. This could
+    cause a problem when zdaemon reinvokes itself, passing it's own set of
+    configuration arguments.  To deal with this, we'll allow duplicate
+    arguments that have the same values.
 
-Wrapper scripts will often embed configuration arguments. This could
-cause a problem when zdaemon reinvokes itself, passing it's own set of
-configuration arguments.  To deal with this, we'll allow duplicate
-arguments that have the same values.
-
     >>> write('conf',
     ... '''
     ... <runner>
@@ -105,7 +108,7 @@
     . .
     daemon process stopped
 
-"""
+    """
 
 def test_stop_timeout():
     r"""



More information about the Zodb-checkins mailing list