/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/ftp/_gssapi.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:
19
19
See RFC2228 for details.
20
20
"""
21
21
 
22
 
import base64, ftplib, getpass, socket
 
22
import base64, ftplib
23
23
 
24
24
from bzrlib import (
25
 
    config,
26
25
    errors,
27
26
    )
28
27
from bzrlib.trace import mutter
29
28
from bzrlib.transport.ftp import FtpTransport
30
 
from bzrlib.transport import register_transport_proto, register_transport
31
29
 
32
30
try:
33
31
    import kerberos