[Checkins] SVN: grokcore.startup/trunk/ Drop zdaemon support.

[Jan-Jaap Driessen]

Log message for revision 117774:
  Drop zdaemon support.

Changed:
  U   grokcore.startup/trunk/CHANGES.txt
  U   grokcore.startup/trunk/setup.py
  U   grokcore.startup/trunk/src/grokcore/startup/__init__.py
  U   grokcore.startup/trunk/src/grokcore/startup/startup.py

-=-
Modified: grokcore.startup/trunk/CHANGES.txt
===================================================================
--- grokcore.startup/trunk/CHANGES.txt	2010-10-19 15:17:48 UTC (rev 117773)
+++ grokcore.startup/trunk/CHANGES.txt	2010-10-19 15:47:49 UTC (rev 117774)
@@ -1,12 +1,11 @@
 Changes
 *******
 
-1.0.3 (unreleased)
-==================
+1.1 (unreleased)
+================
 
-- Nothing changed yet.
+- Drop zdaemon support.
 
-
 1.0.2 (2010-10-05)
 ==================
 

Modified: grokcore.startup/trunk/setup.py
===================================================================
--- grokcore.startup/trunk/setup.py	2010-10-19 15:17:48 UTC (rev 117773)
+++ grokcore.startup/trunk/setup.py	2010-10-19 15:47:49 UTC (rev 117774)
@@ -14,13 +14,10 @@
 
 tests_require = [
     'zope.app.appsetup',
-    'zope.app.testing',
     'zope.component',
-    'zope.container',
     'zope.interface',
-    'zope.site',
     'zope.testing',
-    'zope.traversing',
+    'zope.security',
     ]
 
 setup(
@@ -46,9 +43,7 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=['setuptools',
-                      'zdaemon',
                       'zope.component',
-                      'zope.security',
                       'zope.publisher',
                       'zope.dottedname',
                       'zope.app.wsgi',

Modified: grokcore.startup/trunk/src/grokcore/startup/__init__.py
===================================================================
--- grokcore.startup/trunk/src/grokcore/startup/__init__.py	2010-10-19 15:17:48 UTC (rev 117773)
+++ grokcore.startup/trunk/src/grokcore/startup/__init__.py	2010-10-19 15:47:49 UTC (rev 117774)
@@ -14,5 +14,4 @@
 # Make this a package.
 from grokcore.startup.startup import (application_factory,
                                       debug_application_factory,
-                                      interactive_debug_prompt,
-                                      zdaemon_controller)
+                                      interactive_debug_prompt)

Modified: grokcore.startup/trunk/src/grokcore/startup/startup.py
===================================================================
--- grokcore.startup/trunk/src/grokcore/startup/startup.py	2010-10-19 15:17:48 UTC (rev 117773)
+++ grokcore.startup/trunk/src/grokcore/startup/startup.py	2010-10-19 15:47:49 UTC (rev 117774)
@@ -5,7 +5,6 @@
 import zope.app.debug
 
 from zope.component import provideAdapter
-from zope.security.interfaces import IUnauthorized
 from zope.publisher.interfaces import IReRaiseException
 from zope.dottedname.resolve import resolve
 
@@ -65,24 +64,3 @@
         "The 'app' variable contains the Debugger, 'app.publish(path)' "
         "simulates a request.")
     code.interact(banner=banner, local=globals_)
-
-# To retain backwards compatibilty with the ctl scripts generated by previous
-# versions of grokproject we keep the zdaemon controller code.
-# The intention is to have this code removed during the Grok 1.2 release.
-
-import zdaemon.zdctl
-
-class ControllerCommands(zdaemon.zdctl.ZDCmd):
-
-    def do_debug(self, rest):
-        interactive_debug_prompt()
-
-    def help_debug(self):
-        print "debug -- Initialize the application, providing a debugger"
-        print "         object at an interactive Python prompt."
-
-def zdaemon_controller(zdaemon_conf=os.path.join('parts', 'etc',
-                                                 'zdaemon.conf')):
-    args = ['-C', zdaemon_conf] + sys.argv[1:]
-    zdaemon.zdctl.main(args, options=None, cmdclass=ControllerCommands)
-