/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/transport/http/_urllib.py

  • Committer: Robert Collins
  • Date: 2008-01-03 21:02:06 UTC
  • mfrom: (3162 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3163.
  • Revision ID: robertc@robertcollins.net-20080103210206-eqvta89m37jgjjfi
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_urllib.py
163
163
 
164
164
def get_test_permutations():
165
165
    """Return the permutations to be used in testing."""
166
 
    from bzrlib.tests.HttpServer import HttpServer_urllib
 
166
    from bzrlib.tests.http_server import HttpServer_urllib
167
167
    return [(HttpTransport_urllib, HttpServer_urllib),
168
168
            ]