[Checkins] SVN: zc.zope3recipes/trunk/ clean up whitespace
Fred L. Drake, Jr.
fdrake at gmail.com
Mon Oct 27 14:13:22 EDT 2008
Log message for revision 92623:
clean up whitespace
Changed:
U zc.zope3recipes/trunk/README.txt
U zc.zope3recipes/trunk/setup.py
U zc.zope3recipes/trunk/zc/zope3recipes/WINDOWS.txt
U zc.zope3recipes/trunk/zc/zope3recipes/ctl.py
U zc.zope3recipes/trunk/zc/zope3recipes/debugzope.py
U zc.zope3recipes/trunk/zc/zope3recipes/recipes.py
U zc.zope3recipes/trunk/zc/zope3recipes/tests.py
U zc.zope3recipes/trunk/zc/zope3recipes/winctl.py
-=-
Modified: zc.zope3recipes/trunk/README.txt
===================================================================
--- zc.zope3recipes/trunk/README.txt 2008-10-27 17:58:19 UTC (rev 92622)
+++ zc.zope3recipes/trunk/README.txt 2008-10-27 18:13:22 UTC (rev 92623)
@@ -36,7 +36,7 @@
0.6.1 (2007/12/17)
==================
-Fixed bug: The zope.conf site-definition option could not be overridden.
+Fixed bug: The zope.conf site-definition option could not be overridden.
==================
0.6.0 (2007/11/03)
Modified: zc.zope3recipes/trunk/setup.py
===================================================================
--- zc.zope3recipes/trunk/setup.py 2008-10-27 17:58:19 UTC (rev 92622)
+++ zc.zope3recipes/trunk/setup.py 2008-10-27 18:13:22 UTC (rev 92623)
@@ -49,4 +49,3 @@
"Topic :: Software Development :: Libraries :: Python Modules",
],
)
-
Modified: zc.zope3recipes/trunk/zc/zope3recipes/WINDOWS.txt
===================================================================
--- zc.zope3recipes/trunk/zc/zope3recipes/WINDOWS.txt 2008-10-27 17:58:19 UTC (rev 92622)
+++ zc.zope3recipes/trunk/zc/zope3recipes/WINDOWS.txt 2008-10-27 18:13:22 UTC (rev 92623)
@@ -1678,7 +1678,7 @@
... [instance]
... recipe = zc.zope3recipes:instance
... application = myapp
- ... zope.conf =
+ ... zope.conf =
... ''')
>>> print system(join('bin', 'buildout')),
Modified: zc.zope3recipes/trunk/zc/zope3recipes/ctl.py
===================================================================
--- zc.zope3recipes/trunk/zc/zope3recipes/ctl.py 2008-10-27 17:58:19 UTC (rev 92622)
+++ zc.zope3recipes/trunk/zc/zope3recipes/ctl.py 2008-10-27 18:13:22 UTC (rev 92623)
@@ -39,7 +39,7 @@
def main(args=None):
if args is None:
args = sys.argv[1:]
-
+
class Cmd(ZopectlCmd):
_debugzope = args.pop(0)
_zope_conf = args.pop(0)
Modified: zc.zope3recipes/trunk/zc/zope3recipes/debugzope.py
===================================================================
--- zc.zope3recipes/trunk/zc/zope3recipes/debugzope.py 2008-10-27 17:58:19 UTC (rev 92622)
+++ zc.zope3recipes/trunk/zc/zope3recipes/debugzope.py 2008-10-27 18:13:22 UTC (rev 92623)
@@ -39,10 +39,10 @@
zope.app.appsetup.config(options.site_definition)
db = zope.app.appsetup.appsetup.multi_database(options.databases)[0][0]
notify(zope.app.appsetup.interfaces.DatabaseOpened(db))
-
+
if "PYTHONSTARTUP" in os.environ:
execfile(os.environ["PYTHONSTARTUP"])
-
+
app = zope.app.debug.Debugger.fromDatabase(db)
return dict(
app = app,
@@ -66,8 +66,8 @@
import pdb
pdb.post_mortem(sys.exc_info()[2])
return
-
-
+
+
args = options.args
if args:
Modified: zc.zope3recipes/trunk/zc/zope3recipes/recipes.py
===================================================================
--- zc.zope3recipes/trunk/zc/zope3recipes/recipes.py 2008-10-27 17:58:19 UTC (rev 92622)
+++ zc.zope3recipes/trunk/zc/zope3recipes/recipes.py 2008-10-27 18:13:22 UTC (rev 92623)
@@ -36,7 +36,7 @@
WIN = True
class Application(object):
-
+
def __init__(self, buildout, name, options):
self.options = options
self.name = name
@@ -128,7 +128,7 @@
options = self.options
z3path = options.get('zope3-location')
logger = logging.getLogger(self.name)
- if z3path is not None:
+ if z3path is not None:
if not os.path.exists(z3path):
logger.error("The directory, %r, doesn't exist." % z3path)
raise zc.buildout.UserError("No directory:", z3path)
@@ -163,7 +163,7 @@
class Instance:
deployment = None
-
+
def __init__(self, buildout, name, options):
self.name, self.options = options.get('name', name), options
@@ -185,7 +185,7 @@
if deployment:
# Note we use get below to work with old zc.recipe.deployment eggs.
self.deployment = buildout[deployment].get('name', deployment)
-
+
options['bin-directory'] = buildout[deployment]['rc-directory']
options['run-directory'] = buildout[deployment]['run-directory']
options['log-directory'] = buildout[deployment]['log-directory']
@@ -197,7 +197,7 @@
buildout['buildout']['parts-directory'],
name,
)
-
+
def install(self):
options = self.options
run_directory = options['run-directory']
@@ -379,7 +379,7 @@
dict(path=[path])),
])
-
+
server_template = """
<server>
type HTTP
Modified: zc.zope3recipes/trunk/zc/zope3recipes/tests.py
===================================================================
--- zc.zope3recipes/trunk/zc/zope3recipes/tests.py 2008-10-27 17:58:19 UTC (rev 92622)
+++ zc.zope3recipes/trunk/zc/zope3recipes/tests.py 2008-10-27 18:13:22 UTC (rev 92623)
@@ -102,7 +102,7 @@
... [instance]
... recipe = zc.zope3recipes:instance
... application = myapp
- ... zope.conf =
+ ... zope.conf =
... ''')
>>> print system(join('bin', 'buildout')),
@@ -184,7 +184,7 @@
Generated script '/sample-buildout/parts/myapp/debugzope'.
Installing instance.
Generated script '/root/etc/init.d/myapp-run-instance'.
-
+
"""
def setUp(test):
@@ -217,7 +217,7 @@
), ''),
(re.compile("""['"][^\n"']+zope3recipes[^\n"']*['"],"""),
"'/zope3recipes',"),
- (re.compile('#![^\n]+\n'), ''),
+ (re.compile('#![^\n]+\n'), ''),
(re.compile('-\S+-py\d[.]\d(-\S+)?.egg'),
'-pyN.N.egg',
),
Modified: zc.zope3recipes/trunk/zc/zope3recipes/winctl.py
===================================================================
--- zc.zope3recipes/trunk/zc/zope3recipes/winctl.py 2008-10-27 17:58:19 UTC (rev 92622)
+++ zc.zope3recipes/trunk/zc/zope3recipes/winctl.py 2008-10-27 18:13:22 UTC (rev 92623)
@@ -85,7 +85,7 @@
class Popen(subprocess.Popen):
def recv(self, maxsize=None):
return self._recv('stdout', maxsize)
-
+
def recv_err(self, maxsize=None):
return self._recv('stderr', maxsize)
@@ -98,7 +98,7 @@
elif maxsize < 1:
maxsize = 1
return getattr(self, which), maxsize
-
+
def _close(self, which):
getattr(self, which).close()
setattr(self, which, None)
@@ -123,7 +123,7 @@
conn, maxsize = self.get_conn_maxsize(which, maxsize)
if conn is None:
return None
-
+
try:
x = msvcrt.get_osfhandle(conn.fileno())
(read, nAvail, nMessage) = PeekNamedPipe(x, 0)
@@ -137,7 +137,7 @@
if why[0] in (109, errno.ESHUTDOWN):
return self._close(which)
raise
-
+
if self.universal_newlines:
read = self._translate_newlines(read)
return read
@@ -162,13 +162,13 @@
class ZopectlCmd(zdaemon.zdctl.ZDCmd):
- """Manages Zope start and stop etc.
-
- This implementation uses a subprocess for execute the given python script.
+ """Manages Zope start and stop etc.
- There is also a windows service daemon which can get installed with the
- install and remove methods. If a windows service is installed, the
- controller dispatches the start and stop commands to the service. If no
+ This implementation uses a subprocess for execute the given python script.
+
+ There is also a windows service daemon which can get installed with the
+ install and remove methods. If a windows service is installed, the
+ controller dispatches the start and stop commands to the service. If no
service is installed, we use the subprocess instead.
"""
@@ -256,7 +256,7 @@
if not self.zd_pid:
print "Zope3 is not running"
return
-
+
killAll(self.zd_pid)
self.zd_up = 0
self.zd_pid = 0
@@ -328,7 +328,7 @@
def main(args=None):
if args is None:
args = sys.argv[1:]
-
+
class Cmd(ZopectlCmd):
_debugzope = args.pop(0)
_zope_conf = args.pop(0)
More information about the Checkins
mailing list