~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
30
30
 
31
31
from bzrlib.transport import Transport, register_transport, Server
32
32
from bzrlib.errors import (TransportNotPossible, NoSuchFile,
33
 
                           TransportError, ConnectionError)
34
 
from bzrlib.errors import BzrError, BzrCheckError
 
33
                           TransportError, ConnectionError, InvalidURL)
35
34
from bzrlib.branch import Branch
36
35
from bzrlib.trace import mutter
37
36
# TODO: load these only when running http tests
113
112
        implementation qualifier.
114
113
        """
115
114
        assert isinstance(relpath, basestring)
 
115
        if isinstance(relpath, unicode):
 
116
            raise InvalidURL(relpath, 'paths must not be unicode.')
116
117
        if isinstance(relpath, basestring):
117
118
            relpath_parts = relpath.split('/')
118
119
        else: