Rev 5271: (Jelmer) Lazily load kerberos support. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sun May 30 19:10:46 BST 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5271 [merge]
revision-id: pqm at pqm.ubuntu.com-20100530181044-m05hg2nakbrqacql
parent: pqm at pqm.ubuntu.com-20100528185203-btfcv05iqxhxbnve
parent: jelmer at samba.org-20100530162611-4awllv8f2f5srjsk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2010-05-30 19:10:44 +0100
message:
(Jelmer) Lazily load kerberos support.
modified:
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py 2010-05-27 01:58:44 +0000
+++ b/bzrlib/transport/__init__.py 2010-05-30 16:26:11 +0000
@@ -47,8 +47,6 @@
""")
from bzrlib.symbol_versioning import (
- deprecated_method,
- deprecated_function,
DEPRECATED_PARAMETER,
)
from bzrlib.trace import (
@@ -1742,36 +1740,28 @@
register_lazy_transport('ftp://', 'bzrlib.transport.ftp', 'FtpTransport')
register_transport_proto('aftp://', help="Access using active FTP.")
register_lazy_transport('aftp://', 'bzrlib.transport.ftp', 'FtpTransport')
-
register_transport_proto('gio+', help="Access using any GIO supported protocols.")
register_lazy_transport('gio+', 'bzrlib.transport.gio_transport', 'GioTransport')
-try:
- import kerberos
- kerberos_available = True
-except ImportError:
- kerberos_available = False
-
-if kerberos_available:
- # Default to trying GSSAPI authentication (if the kerberos module is
- # available)
- register_transport_proto('ftp+gssapi://', register_netloc=True)
- register_lazy_transport('ftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
- 'GSSAPIFtpTransport')
- register_transport_proto('aftp+gssapi://', register_netloc=True)
- register_lazy_transport('aftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
- 'GSSAPIFtpTransport')
- register_transport_proto('ftp+nogssapi://', register_netloc=True)
- register_transport_proto('aftp+nogssapi://', register_netloc=True)
-
- register_lazy_transport('ftp://', 'bzrlib.transport.ftp._gssapi',
- 'GSSAPIFtpTransport')
- register_lazy_transport('aftp://', 'bzrlib.transport.ftp._gssapi',
- 'GSSAPIFtpTransport')
- register_lazy_transport('ftp+nogssapi://', 'bzrlib.transport.ftp',
- 'FtpTransport')
- register_lazy_transport('aftp+nogssapi://', 'bzrlib.transport.ftp',
- 'FtpTransport')
+
+# Default to trying GSSAPI authentication (if the kerberos module is
+# available)
+register_transport_proto('ftp+gssapi://', register_netloc=True)
+register_transport_proto('aftp+gssapi://', register_netloc=True)
+register_transport_proto('ftp+nogssapi://', register_netloc=True)
+register_transport_proto('aftp+nogssapi://', register_netloc=True)
+register_lazy_transport('ftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
+ 'GSSAPIFtpTransport')
+register_lazy_transport('aftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
+ 'GSSAPIFtpTransport')
+register_lazy_transport('ftp://', 'bzrlib.transport.ftp._gssapi',
+ 'GSSAPIFtpTransport')
+register_lazy_transport('aftp://', 'bzrlib.transport.ftp._gssapi',
+ 'GSSAPIFtpTransport')
+register_lazy_transport('ftp+nogssapi://', 'bzrlib.transport.ftp',
+ 'FtpTransport')
+register_lazy_transport('aftp+nogssapi://', 'bzrlib.transport.ftp',
+ 'FtpTransport')
register_transport_proto('memory://')
register_lazy_transport('memory://', 'bzrlib.transport.memory',
=== modified file 'bzrlib/transport/ftp/_gssapi.py'
--- a/bzrlib/transport/ftp/_gssapi.py 2009-10-06 08:24:14 +0000
+++ b/bzrlib/transport/ftp/_gssapi.py 2010-05-30 16:26:11 +0000
@@ -19,15 +19,13 @@
See RFC2228 for details.
"""
-import base64, ftplib, getpass, socket
+import base64, ftplib
from bzrlib import (
- config,
errors,
)
from bzrlib.trace import mutter
from bzrlib.transport.ftp import FtpTransport
-from bzrlib.transport import register_transport_proto, register_transport
try:
import kerberos
=== modified file 'bzrlib/transport/http/_pycurl.py'
--- a/bzrlib/transport/http/_pycurl.py 2009-08-19 16:33:39 +0000
+++ b/bzrlib/transport/http/_pycurl.py 2010-05-30 16:22:32 +0000
@@ -31,16 +31,12 @@
# from _curl_perform. Not done because we may deprecate pycurl in the
# future -- vila 20070212
-import os
from cStringIO import StringIO
import httplib
-import sys
from bzrlib import (
debug,
errors,
- trace,
- __version__ as bzrlib_version,
)
import bzrlib
from bzrlib.trace import mutter
More information about the bazaar-commits
mailing list