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

  • Committer: Robert Collins
  • Date: 2010-06-21 01:30:45 UTC
  • mfrom: (5309 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5310.
  • Revision ID: robertc@robertcollins.net-20100621013045-s59nfjps3rkcn53j
Merge trunk to fix NEWS sections.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
47
47
""")
48
48
 
49
49
from bzrlib.symbol_versioning import (
50
 
        deprecated_method,
51
 
        deprecated_function,
52
50
        DEPRECATED_PARAMETER,
53
51
        )
54
52
from bzrlib.trace import (
1553
1551
        return transport
1554
1552
 
1555
1553
 
1556
 
# We try to recognize an url lazily (ignoring user, password, etc)
1557
 
_urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<rest>.*)$')
1558
 
 
1559
1554
def get_transport(base, possible_transports=None):
1560
1555
    """Open a transport to access a URL or directory.
1561
1556
 
1574
1569
    base = directories.dereference(base)
1575
1570
 
1576
1571
    def convert_path_to_url(base, error_str):
1577
 
        m = _urlRE.match(base)
1578
 
        if m:
 
1572
        if urlutils.is_url(base):
1579
1573
            # This looks like a URL, but we weren't able to
1580
1574
            # instantiate it as such raise an appropriate error
1581
1575
            # FIXME: we have a 'error_str' unused and we use last_err below
1742
1736
register_lazy_transport('ftp://', 'bzrlib.transport.ftp', 'FtpTransport')
1743
1737
register_transport_proto('aftp://', help="Access using active FTP.")
1744
1738
register_lazy_transport('aftp://', 'bzrlib.transport.ftp', 'FtpTransport')
1745
 
 
1746
 
try:
1747
 
    import kerberos
1748
 
    kerberos_available = True
1749
 
except ImportError:
1750
 
    kerberos_available = False
1751
 
 
1752
 
if kerberos_available:
1753
 
    # Default to trying GSSAPI authentication (if the kerberos module is
1754
 
    # available)
1755
 
    register_transport_proto('ftp+gssapi://', register_netloc=True)
1756
 
    register_lazy_transport('ftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
1757
 
                            'GSSAPIFtpTransport')
1758
 
    register_transport_proto('aftp+gssapi://', register_netloc=True)
1759
 
    register_lazy_transport('aftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
1760
 
                            'GSSAPIFtpTransport')
1761
 
    register_transport_proto('ftp+nogssapi://', register_netloc=True)
1762
 
    register_transport_proto('aftp+nogssapi://', register_netloc=True)
1763
 
 
1764
 
    register_lazy_transport('ftp://', 'bzrlib.transport.ftp._gssapi',
1765
 
                            'GSSAPIFtpTransport')
1766
 
    register_lazy_transport('aftp://', 'bzrlib.transport.ftp._gssapi',
1767
 
                            'GSSAPIFtpTransport')
1768
 
    register_lazy_transport('ftp+nogssapi://', 'bzrlib.transport.ftp',
1769
 
                            'FtpTransport')
1770
 
    register_lazy_transport('aftp+nogssapi://', 'bzrlib.transport.ftp',
1771
 
                            'FtpTransport')
 
1739
register_transport_proto('gio+', help="Access using any GIO supported protocols.")
 
1740
register_lazy_transport('gio+', 'bzrlib.transport.gio_transport', 'GioTransport')
 
1741
 
 
1742
 
 
1743
# Default to trying GSSAPI authentication (if the kerberos module is
 
1744
# available)
 
1745
register_transport_proto('ftp+gssapi://', register_netloc=True)
 
1746
register_transport_proto('aftp+gssapi://', register_netloc=True)
 
1747
register_transport_proto('ftp+nogssapi://', register_netloc=True)
 
1748
register_transport_proto('aftp+nogssapi://', register_netloc=True)
 
1749
register_lazy_transport('ftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
 
1750
                        'GSSAPIFtpTransport')
 
1751
register_lazy_transport('aftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
 
1752
                        'GSSAPIFtpTransport')
 
1753
register_lazy_transport('ftp://', 'bzrlib.transport.ftp._gssapi',
 
1754
                        'GSSAPIFtpTransport')
 
1755
register_lazy_transport('aftp://', 'bzrlib.transport.ftp._gssapi',
 
1756
                        'GSSAPIFtpTransport')
 
1757
register_lazy_transport('ftp+nogssapi://', 'bzrlib.transport.ftp',
 
1758
                        'FtpTransport')
 
1759
register_lazy_transport('aftp+nogssapi://', 'bzrlib.transport.ftp',
 
1760
                        'FtpTransport')
1772
1761
 
1773
1762
register_transport_proto('memory://')
1774
1763
register_lazy_transport('memory://', 'bzrlib.transport.memory',