/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/transport/__init__.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1537
1537
        """
1538
1538
        try:
1539
1539
            parsed_url = self._split_url(other_base)
1540
 
        except errors.InvalidURL:
 
1540
        except urlutils.InvalidURL:
1541
1541
            # No hope in trying to reuse an existing transport for an invalid
1542
1542
            # URL
1543
1543
            return None
1591
1591
        location = location.encode('ascii')
1592
1592
    except UnicodeError:
1593
1593
        if urlutils.is_url(location):
1594
 
            raise errors.InvalidURL(path=location,
 
1594
            raise urlutils.InvalidURL(path=location,
1595
1595
                extra='URLs must be properly escaped')
1596
1596
        location = urlutils.local_path_to_url(location)
1597
1597
    if PY3:
1647
1647
                    possible_transports.append(transport)
1648
1648
                return transport
1649
1649
    if not urlutils.is_url(url):
1650
 
        raise errors.InvalidURL(path=url)
 
1650
        raise urlutils.InvalidURL(path=url)
1651
1651
    raise errors.UnsupportedProtocol(url, last_err)
1652
1652
 
1653
1653