/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: 2009-05-23 20:57:12 UTC
  • mfrom: (4371 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4441.
  • Revision ID: robertc@robertcollins.net-20090523205712-lcwbfqk6vwavinuv
Merge .dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ftp/_gssapi.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Support for secure authentication using GSSAPI over FTP.
18
18
 
118
118
 
119
119
        auth = config.AuthenticationConfig()
120
120
        if user is None:
121
 
            user = auth.get_user('ftp', self._host, port=self._port)
122
 
            if user is None:
123
 
                # Default to local user
124
 
                user = getpass.getuser()
125
 
 
 
121
            user = auth.get_user('ftp', self._host, port=self._port,
 
122
                                 default=getpass.getuser())
126
123
        mutter("Constructing FTP instance against %r" %
127
124
               ((self._host, self._port, user, '********',
128
125
                self.is_active),))
150
147
 
151
148
def get_test_permutations():
152
149
    """Return the permutations to be used in testing."""
153
 
    from bzrlib import tests
154
 
    if tests.FTPServerFeature.available():
155
 
        from bzrlib.tests import ftp_server
156
 
        return [(GSSAPIFtpTransport, ftp_server.FTPServer)]
 
150
    from bzrlib.tests import ftp_server
 
151
    if ftp_server.FTPServerFeature.available():
 
152
        return [(GSSAPIFtpTransport, ftp_server.FTPTestServer)]
157
153
    else:
158
154
        return []