Rev 6238: (jelmer) Fix import in the FTP GSSAPI support. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6238 [merge]
revision-id: pqm at pqm.ubuntu.com-20111102131727-qr5dgvmr33oh22yx
parent: pqm at pqm.ubuntu.com-20111102000324-ogs34omxu95ebikb
parent: jelmer at samba.org-20111102124955-ciyanag21yw33jlh
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-11-02 13:17:27 +0000
message:
  (jelmer) Fix import in the FTP GSSAPI support. (Jelmer Vernooij)
modified:
  bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
=== modified file 'bzrlib/transport/ftp/_gssapi.py'
--- a/bzrlib/transport/ftp/_gssapi.py	2011-09-20 10:49:47 +0000
+++ b/bzrlib/transport/ftp/_gssapi.py	2011-11-02 12:49:55 +0000
@@ -25,7 +25,10 @@
     errors,
     )
 from bzrlib.i18n import gettext
-from bzrlib.trace import mutter
+from bzrlib.trace import (
+    mutter,
+    note,
+    )
 from bzrlib.transport.ftp import FtpTransport
 
 try:
@@ -80,8 +83,8 @@
                         if not ((resp.startswith('235 ') and rc == 1) or
                                 (resp.startswith('335 ') and rc == 0)):
                             raise ftplib.error_reply, resp
-            trace.note(gettext("Authenticated as %s") %
-                            kerberos.authGSSClientUserName(self.vc))
+            note(gettext("Authenticated as %s") %
+                 kerberos.authGSSClientUserName(self.vc))
 
             # Monkey patch ftplib
             self.putcmd = self.mic_putcmd