← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/HTTPTestUtil.py

Merge from bzr.dev, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/HTTPTestUtil.py
31
31
from bzrlib.transport import (
32
32
    get_transport,
33
33
    )
 
34
from bzrlib.smart import protocol
34
35
 
35
36
 
36
37
class WallRequestHandler(TestingHTTPRequestHandler):