Ticket #637: odd-filenaming-637.patch

doc/core/howto/tutorial/intro.xhtml

@@ -156 +156 @@
 <p>After saving the next example (finger11.py) as <q>finger.tac</q>,
 read on to find out how to run this code using the twistd utility.</p>
 
-<a href="listings/finger/finger11.py" class="py-listing">finger11.py</a>
-
-
-
 <h2>twistd</h2>
 
 <p>This is how to run <q>Twisted Applications</q> &mdash; files which define an
@@ -170 +166 @@
 application developer can concentrate on writing his networking code.
 </p>
 
+<a href="listings/finger/finger11.tac" class="py-listing">finger11.tac</a>
+
 <pre class="shell">
-root% twistd -ny finger.tac # just like before
-root% twistd -y finger.tac # daemonize, keep pid in twistd.pid
-root% twistd -y finger.tac --pidfile=finger.pid
-root% twistd -y finger.tac --rundir=/
-root% twistd -y finger.tac --chroot=/var
-root% twistd -y finger.tac -l /var/log/finger.log
-root% twistd -y finger.tac --syslog # just log to syslog
-root% twistd -y finger.tac --syslog --prefix=twistedfinger # use given prefix
+root% twistd -ny finger11.tac # just like before
+root% twistd -y finger11.tac # daemonize, keep pid in twistd.pid
+root% twistd -y finger11.tac --pidfile=finger.pid
+root% twistd -y finger11.tac --rundir=/
+root% twistd -y finger11.tac --chroot=/var
+root% twistd -y finger11.tac -l /var/log/finger.log
+root% twistd -y finger11.tac --syslog # just log to syslog
+root% twistd -y finger11.tac --syslog --prefix=twistedfinger # use given prefix
 </pre>
 
 </body>

doc/core/howto/tutorial/listings/finger/finger11.py

@@ -1 @@
-# Read username, output from non-empty factory, drop connections
-# Use deferreds, to minimize synchronicity assumptions
-# Write application. Save in 'finger.tpy'
-from twisted.application import internet, service
-from twisted.internet import protocol, reactor, defer
-from twisted.protocols import basic
-class FingerProtocol(basic.LineReceiver):
-    def lineReceived(self, user):
-        self.factory.getUser(user
-        ).addErrback(lambda _: "Internal error in server"
-        ).addCallback(lambda m:
-                      (self.transport.write(m+"\r\n"),
-                       self.transport.loseConnection()))
-class FingerFactory(protocol.ServerFactory):
-    protocol = FingerProtocol
-    def __init__(self, **kwargs): self.users = kwargs
-    def getUser(self, user):
-        return defer.succeed(self.users.get(user, "No such user"))
-
-application = service.Application('finger', uid=1, gid=1)
-factory = FingerFactory(moshez='Happy and well')
-internet.TCPServer(79, factory).setServiceParent(
-    service.IServiceCollection(application))