/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/HTTPTestUtil.py

  • Committer: Jonathan Lange
  • Date: 2007-04-22 23:00:56 UTC
  • mfrom: (2440 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2446.
  • Revision ID: jml@canonical.com-20070422230056-mfu7bo3ydrbbag7p
Merge bzr.dev, resolving conflicts in error code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/HTTPTestUtil.py
21
21
import socket
22
22
import urlparse
23
23
 
 
24
from bzrlib.smart import protocol
24
25
from bzrlib.tests import TestCaseWithTransport
25
26
from bzrlib.tests.HttpServer import (
26
27
    HttpServer,
29
30
from bzrlib.transport import (
30
31
    get_transport,
31
32
    )
32
 
from bzrlib.smart import protocol
33
33
 
34
34
 
35
35
class WallRequestHandler(TestingHTTPRequestHandler):