← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

[merge] update from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_urllib.py
18
18
 
19
19
from bzrlib.errors import BzrError
20
20
from bzrlib.trace import mutter
21
 
from bzrlib.transport.http import HttpTransportBase, extract_auth
22
 
from bzrlib.errors import (TransportNotPossible, NoSuchFile, 
 
21
from bzrlib.transport.http import HttpTransportBase, extract_auth, HttpServer
 
22
from bzrlib.errors import (TransportNotPossible, NoSuchFile,
23
23
                           TransportError, ConnectionError)
24
24
 
25
25
 
127
127
        """Delete the item at relpath"""
128
128
        raise TransportNotPossible('http does not support delete()')
129
129
 
 
130
def get_test_permutations():
 
131
    """Return the permutations to be used in testing."""
 
132
    # XXX: There are no HTTPS transport provider tests yet.
 
133
    return [(HttpTransport, HttpServer),
 
134
            ]