Changeset 24674

Timestamp:

09/02/2008 11:57:09 AM (10 months ago)

Author:

therve

Message:

Revert changes to tap files

Files:

• branches/run-plugin-1490-2/twisted/conch/tap.py (modified) (2 diffs)
• branches/run-plugin-1490-2/twisted/mail/tap.py (modified) (2 diffs)
• branches/run-plugin-1490-2/twisted/names/tap.py (modified) (2 diffs)
• branches/run-plugin-1490-2/twisted/web/tap.py (modified) (3 diffs)

branches/run-plugin-1490-2/twisted/conch/tap.py

@@ -2 +2 @@
 # See LICENSE for details.
 
+# 
+# Twisted, the Framework of Your Internet
+# Copyright (c) 2001-2004 Twisted Matrix Laboratories.
+# See LICENSE for details.
+
+
 """
-Support module for making SSH servers with mktap.
+I am a support module for making SSH servers with mktap.
 """
 
@@ -11 +17 @@
 from twisted.python import usage
 from twisted.application import strports
-
 
 

branches/run-plugin-1490-2/twisted/mail/tap.py

@@ -1 +1 @@
 # -*- test-case-name: twisted.mail.test.test_options -*-
-# Copyright (c) 2001-2008 Twisted Matrix Laboratories.
+# Copyright (c) 2001-2004 Twisted Matrix Laboratories.
 # See LICENSE for details.
 
-"""
-Support module for creating mail servers with 'mktap'
+
+"""I am the support module for creating mail servers with 'mktap'
 """
 
 import os
+import sys
 
 from twisted.mail import mail
@@ -19 +20 @@
 from twisted.cred import checkers
 from twisted.application import internet
-
 
 

branches/run-plugin-1490-2/twisted/names/tap.py

@@ -1 @@
-# Copyright (c) 2001-2008 Twisted Matrix Laboratories.
+# Copyright (c) 2001-2004 Twisted Matrix Laboratories.
 # See LICENSE for details.
+
 
 """
@@ -15 +16 @@
 from twisted.names import authority
 from twisted.names import secondary
-
-
 
 class Options(usage.Options):

branches/run-plugin-1490-2/twisted/web/tap.py

@@ -8 +8 @@
 import os
 
-from twisted.web import server, static, twcgi, script, demo, distrib, trp
-from twisted.internet import interfaces
-from twisted.python import usage, reflect
+# Twisted Imports
+from twisted.web import server, static, twcgi, script, demo, distrib, trp, wsgi
+from twisted.internet import interfaces, reactor
+from twisted.python import usage, reflect, threadpool
 from twisted.spread import pb
 from twisted.application import internet, service, strports
-
 
 
@@ -62 +62 @@
 
     def opt_path(self, path):
-        """<path> is either a specific file or a directory to
-        be set as the root of the web server. Use this if you
-        have a directory full of HTML, cgi, php3, epy, or rpy files or
-        any other files that you want to be served up raw.
+        """
+        <path> is either a specific file or a directory to be set as the root
+        of the web server. Use this if you have a directory full of HTML, cgi,
+        php3, epy, or rpy files or any other files that you want to be served
+        up raw.
         """
 
@@ -105 +106 @@
         """An .rpy file to be used as the root resource of the webserver."""
         self['root'] = script.ResourceScriptWrapper(name)
+
+
+    def opt_wsgi(self, name):
+        """
+        The FQPN of a WSGI application object to serve as the root resource of
+        the webserver.
+        """
+        pool = threadpool.ThreadPool()
+        reactor.callWhenRunning(pool.start)
+        reactor.addSystemEventTrigger('after', 'shutdown', pool.stop)
+        try:
+            application = reflect.namedAny(name)
+        except (AttributeError, ValueError):
+            raise usage.UsageError("No such WSGI application: %r" % (name,))
+        self['root'] = wsgi.WSGIResource(reactor, pool, application)