/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/__init__.py

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
from bzrlib.smart import medium
35
35
from bzrlib.symbol_versioning import (
36
36
        deprecated_method,
37
 
        zero_seventeen,
38
37
        )
39
38
from bzrlib.trace import mutter
40
39
from bzrlib.transport import (
52
51
    password manager.  Return the url, minus those auth parameters (which
53
52
    confuse urllib2).
54
53
    """
55
 
    assert re.match(r'^(https?)(\+\w+)?://', url), \
56
 
            'invalid absolute url %r' % url
 
54
    if not re.match(r'^(https?)(\+\w+)?://', url):
 
55
        raise ValueError(
 
56
            'invalid absolute url %r' % (url,))
57
57
    scheme, netloc, path, query, fragment = urlparse.urlsplit(url)
58
58
 
59
59
    if '@' in netloc: