[Checkins] SVN: zc.recipe.zope3instance/branches/gocept-zconf-slug-dev/src/zc/recipe/zope3instance/ - minimal code-style changes

[Christian Theune]

Log message for revision 71467:
   - minimal code-style changes
  

Changed:
  U   zc.recipe.zope3instance/branches/gocept-zconf-slug-dev/src/zc/recipe/zope3instance/__init__.py
  U   zc.recipe.zope3instance/branches/gocept-zconf-slug-dev/src/zc/recipe/zope3instance/zope3scripts.py

-=-
Modified: zc.recipe.zope3instance/branches/gocept-zconf-slug-dev/src/zc/recipe/zope3instance/__init__.py
===================================================================
--- zc.recipe.zope3instance/branches/gocept-zconf-slug-dev/src/zc/recipe/zope3instance/__init__.py	2006-12-06 20:33:11 UTC (rev 71466)
+++ zc.recipe.zope3instance/branches/gocept-zconf-slug-dev/src/zc/recipe/zope3instance/__init__.py	2006-12-06 20:41:21 UTC (rev 71467)
@@ -76,14 +76,16 @@
         for dir in ['log_dir', 'run_dir', 'subprogram_dir', 'config_dir']:
             if not options.has_key(dir):
                 options[dir] = dest
-        requirements, ws = self.egg.working_set()
 
+        options['site_zcml_path'] = os.path.join(options['config_dir'], 'site.zcml')
+
         # XXX In theory we could just delete the parts directory here, if it
         # exists already. Or not?
         os.mkdir(dest)
 
-        options['site_zcml_path'] = os.path.join(options['config_dir'], 'site.zcml')
 
+        requirements, ws = self.egg.working_set()
+
         # install subprograms and ctl scripts
         zc.buildout.easy_install.scripts(
             [('runzope', 'zope.app.twisted.main', 'main')],

Modified: zc.recipe.zope3instance/branches/gocept-zconf-slug-dev/src/zc/recipe/zope3instance/zope3scripts.py
===================================================================
--- zc.recipe.zope3instance/branches/gocept-zconf-slug-dev/src/zc/recipe/zope3instance/zope3scripts.py	2006-12-06 20:33:11 UTC (rev 71466)
+++ zc.recipe.zope3instance/branches/gocept-zconf-slug-dev/src/zc/recipe/zope3instance/zope3scripts.py	2006-12-06 20:41:21 UTC (rev 71467)
@@ -21,14 +21,16 @@
 """
 
 import os, sys
+
 import zope.app.debug
 import zope.app.twisted.main
 
+
 def zglobals(args):
     db = zope.app.twisted.main.debug(args)
     if "PYTHONSTARTUP" in os.environ:
         execfile(os.environ["PYTHONSTARTUP"])
-    
+
     app = zope.app.debug.Debugger.fromDatabase(db)
     return dict(
         app = app,
@@ -37,7 +39,6 @@
         __name__ = '__main__',
         )
 
-
 def script(args):
     globs = zglobals(args[:2])
     sys.argv[:] = args[2:]
@@ -45,14 +46,14 @@
     execfile(sys.argv[0], globs)
     sys.exit()
 
-banner = """Welcome to the Zope 3 "debugger".
-The application root object is available as the root variable.
-A Zope debugger instance is available as the debugger (aka app) variable.
+
+banner = """Welcome to the Zope 3 debugging shell.
+
+The application root object is available as the "root" variable.
+A Zope debugger instance is available as the "debugger" (aka "app") variable.
 """
 
 def debug(args):
     globs = zglobals(args)
     import code
     code.interact(banner=banner, local=globs)
-
-