Changeset 24673

Timestamp:

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

Author:

therve

Message:

Remove tap support, clean API links.

Files:

• branches/run-plugin-1490-2/doc/core/howto/tap.xhtml (modified) (2 diffs)
• 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/plugins/twisted_run.py (modified) (1 diff)
• branches/run-plugin-1490-2/twisted/test/test_twistd.py (modified) (4 diffs)
• branches/run-plugin-1490-2/twisted/web/tap.py (modified) (2 diffs)

branches/run-plugin-1490-2/doc/core/howto/tap.xhtml

@@ -137 +137 @@
     class="API" base="twisted.application.service">IService</code>
     implementation which will be run by <code class="shell">twistd</code>,
-    in this case an <code class="API" base="twisted.application">
-    internet.TCPServer</code>. You can read more about services in the <a
-    href="application.xhtml">application howto</a>: for example, it describes
-    <a href="application.xhtml#services-provided">the list of services
+    in this case an
+    <code class="API" base="twisted.application">internet.TCPServer</code>. You
+    can read more about services in the <a href="application.xhtml">application
+    howto</a>: for example, it describes <a
+    href="application.xhtml#services-provided">the list of services
     provided</a> and how to build <a
     href="application.xhtml#service-collection">service collections</a>.
@@ -148 +149 @@
     <code class="python">MyServiceMaker</code> because <code class="shell">
     twistd run</code> accepts the name of an object that <strong>provides
-    </strong> <code class="API" base="twisted.application.service">
-    ISimpleServiceMaker</code>, not the name of an object that <strong>
-    implements</strong> it.
+    </strong>
+    <code class="API" base="twisted.application.service">ISimpleServiceMaker</code>,
+    not the name of an object that <strong> implements</strong> it.
 </p>
 
 <p>
     To run this service, you call the run plugin with twistd, passing the fully
-    qualified named of your object providing <code class="API" base="twisted.application.service">
-    ISimpleServiceMaker</code>.
+    qualified named of your object providing
+    <code class="API" base="twisted.application.service">ISimpleServiceMaker</code>.
 </p>
 

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

@@ -6 +6 @@
 """
 
-from zope.interface import moduleProvides
-
 from twisted.conch import checkers, unix
 from twisted.conch.openssh_compat import factory
@@ -13 +11 @@
 from twisted.python import usage
 from twisted.application import strports
-from twisted.application.service import ISimpleServiceMaker
-
-
-
-moduleProvides(ISimpleServiceMaker)
 
 

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

@@ -8 +8 @@
 
 import os
-
-from zope.interface import moduleProvides
 
 from twisted.mail import mail
@@ -21 +19 @@
 from twisted.cred import checkers
 from twisted.application import internet
-from twisted.application.service import ISimpleServiceMaker
-
-
-
-moduleProvides(ISimpleServiceMaker)
 
 

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

@@ -8 +8 @@
 import os, traceback
 
-from zope.interface import moduleProvides
-
 from twisted.python import usage
 from twisted.names import dns
@@ -18 +16 @@
 from twisted.names import secondary
 
-
-moduleProvides(service.ISimpleServiceMaker)
 
 

branches/run-plugin-1490-2/twisted/plugins/twisted_run.py

@@ -78 +78 @@
             raise SystemExit("'%s' doesn't provide the ISimpleServiceMaker "
                              "interface" % (options['maker'],))
-        opts = getattr(maker, 'options', None)
-        if opts is not None:
-            subOptions = opts()
-        else:
-            # Compatibility with tap module
-            subOptions = maker.Options()
+        subOptions = maker.options()
         subOptions.parseOptions(options['maker_options'])
         return maker.makeService(subOptions)

branches/run-plugin-1490-2/twisted/test/test_twistd.py

@@ -1078 +1078 @@
 
 
-class StubTAP(object):
-    """
-    A fake TAP module to be run by L{RunPlugin}.
-    """
-    implements(service.ISimpleServiceMaker)
-    Options = StubOptions
-
-    def makeService(self, options):
-        """
-        Create a dummy service and save options in C{self.savedOptions}.
-        """
-        self.savedOptions = options
-        self.service = service.Service()
-        return self.service
-
-
-
 class RunPluginTests(unittest.TestCase):
     """
     Tests for the twistd L{RunPlugin}.
-
-    @cvar stubTAP: a TAP module to use during tests.
-    @type stubTAP: L{StubTAP}
 
     @cvar stubService: a service to use during tests.
@@ -1115 +1095 @@
         self.plugin = RunPlugin()
         cls = self.__class__
-        cls.stubTAP = StubTAP()
         cls.stubService = StubServiceMaker()
         directlyProvides(cls.stubService, service.ISimpleServiceMaker)
@@ -1127 +1106 @@
         """
         cls = self.__class__
-        cls.stubTAP = None
         cls.stubService = None
 
@@ -1221 +1199 @@
 
 
-    def test_tapModule(self):
-        """
-        L{RunPlugin.makeService} supports running TAP modules, the difference
-        being that the options attribute has a different name.
-        """
-        opt = self.plugin.options()
-        opt.parseArgs("%s.%s.stubTAP" % (
-            self.__module__, self.__class__.__name__))
-        srv = self.plugin.makeService(opt)
-        self.assertIdentical(srv, self.stubTAP.service)
-        self.assertEquals(self.stubTAP.savedOptions, {'foo': '1234'})
-
-
     def test_foundInPlugins(self):
         """

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

@@ -7 +7 @@
 
 import os
-
-from zope.interface import moduleProvides
 
 from twisted.web import server, static, twcgi, script, demo, distrib, trp
@@ -15 +13 @@
 from twisted.spread import pb
 from twisted.application import internet, service, strports
-
-
-
-moduleProvides(service.ISimpleServiceMaker)