← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/wsgi.py

  • Committer: Vincent Ladeuil
  • Date: 2010-01-25 15:55:48 UTC
  • mto: (4985.1.4 add-attr-cleanup)
  • mto: This revision was merged to the branch mainline in revision 4988.
  • Revision ID: v.ladeuil+lp@free.fr-20100125155548-0l352pujvt5bzl5e
Deploy addAttrCleanup on the whole test suite.

Several use case worth mentioning:

- setting a module or any other object attribute is the majority
by far. In some cases the setting itself is deferred but most of
the time we want to set at the same time we add the cleanup.

- there multiple occurrences of protecting hooks or ui factory
which are now useless (the test framework takes care of that now),

- there was some lambda uses that can now be avoided.

That first cleanup already simplifies things a lot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/wsgi.py
106
106
        # e.g. consider a smart server request for "get /etc/passwd" or
107
107
        # something.
108
108
        self.chroot_server = chroot.ChrootServer(backing_transport)
109
 
        self.chroot_server.setUp()
 
109
        self.chroot_server.start_server()
110
110
        self.backing_transport = get_transport(self.chroot_server.get_url())
111
111
        self.root_client_path = root_client_path
112
112
        # While the chroot server can technically be torn down at this point,
114
114
        # protocol dictionary, we don't *just in case* there are parts of
115
115
        # bzrlib that will invoke 'get_transport' on urls rather than cloning
116
116
        # around the existing transport.
117
 
        #self.chroot_server.tearDown()
 
117
        #self.chroot_server.stop_server()
118
118
 
119
119
    def __call__(self, environ, start_response):
120
120
        """WSGI application callable."""
176
176
    def make_request(self, transport, write_func, request_bytes, rcp):
177
177
        protocol_factory, unused_bytes = medium._get_protocol_factory_for_bytes(
178
178
            request_bytes)
179
 
        server_protocol = protocol_factory(transport, write_func, rcp)
 
179
        server_protocol = protocol_factory(
 
180
            transport, write_func, rcp, self.backing_transport)
180
181
        server_protocol.accept_bytes(unused_bytes)
181
182
        return server_protocol