← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ftp/_gssapi.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ftp/_gssapi.py
19
19
See RFC2228 for details.
20
20
"""
21
21
 
 
22
from __future__ import absolute_import
 
23
 
22
24
import base64, ftplib
23
25
 
24
26
from bzrlib import (
25
27
    errors,
26
28
    )
27
 
from bzrlib.trace import mutter
 
29
from bzrlib.i18n import gettext
 
30
from bzrlib.trace import (
 
31
    mutter,
 
32
    note,
 
33
    )
28
34
from bzrlib.transport.ftp import FtpTransport
29
35
 
30
36
try:
79
85
                        if not ((resp.startswith('235 ') and rc == 1) or
80
86
                                (resp.startswith('335 ') and rc == 0)):
81
87
                            raise ftplib.error_reply, resp
82
 
            trace.note("Authenticated as %s" % kerberos.authGSSClientUserName(
83
 
                    self.vc))
 
88
            note(gettext("Authenticated as %s") %
 
89
                 kerberos.authGSSClientUserName(self.vc))
84
90
 
85
91
            # Monkey patch ftplib
86
92
            self.putcmd = self.mic_putcmd