Changeset 75

Show
Ignore:
Timestamp:
08/16/07 15:08:49 (1 year ago)
Author:
edsuom
Message:

Good-enough-for-now fixes to simpleserver.http; working on Konrads processworker

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • projects/Twisted-Goodies/trunk/misc/var_www_foss.tellectual.com_index.py

    r74 r75  
    7979 
    8080 
     81class DisabledResource(StanResource): 
     82    addSlash = False 
     83 
     84    def __init__(self, whatDisabled): 
     85        self.whatDisabled = whatDisabled 
     86        self.title = "%s Temporarily Disabled" % whatDisabled 
     87 
     88    def render(self, request): 
     89        return [ 
     90            T.h2[self.title], 
     91            T.p["Hopefully this should be fixed soon."]] 
     92 
    8193 
    8294class Resource(StanResource): 
    …… 
    210222            listOp('append', 'wiki') 
    211223        root, isAtRoot = rootState(subSegments) 
     224        if root == 'changeset': 
     225            # TODO, hopefully won't need this long 
     226            return DisabledResource("Changeset Listings"), () 
    212227        if root == 'wiki' and len(subSegments) > 1: 
    213228            subRoot = subSegments[1] 

  • projects/Twisted-Goodies/trunk/twisted_goodies/simpleserver/http/wsgi.py

    r71 r75  
    136136 
    137137 
    138 class WSGIResource(TracerMixin, object): 
     138class WSGIResource(object): 
    139139    """ 
    140140    A web2 Resource which wraps the given WSGI application callable. 
    …… 
    172172        self.handlers.append(handler) 
    173173        # Queue it up for running in the thread 
    174         if self.isTracing: 
    175             d = defer.succeed(None) 
    176         else: 
    177             d = self.queue.call(self.settrace) 
    178         d.addCallback(lambda _: self.queue.call(handler.run)) 
    179         d.addBoth(done, IP) 
     174        self.queue.call(handler.run).addBoth(done, IP) 
    180175        # We get the result piecemeal from this method call's unique handler, 
    181176        # not in some single result of the run method. So there's no need to do