← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ftp.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ftp.py
27
27
from cStringIO import StringIO
28
28
import errno
29
29
import ftplib
 
30
import getpass
30
31
import os
31
32
import os.path
32
33
import urlparse
 
34
import socket
33
35
import stat
34
36
import time
35
37
import random
141
143
                                             port=self._port)
142
144
            connection.login(user=user, passwd=password)
143
145
            connection.set_pasv(not self.is_active)
 
146
        except socket.error, e:
 
147
            raise errors.SocketConnectionError(self._host, self._port,
 
148
                                               msg='Unable to connect to',
 
149
                                               orig_error= e)
144
150
        except ftplib.error_perm, e:
145
151
            raise errors.TransportError(msg="Error setting up connection:"
146
152
                                        " %s" % str(e), orig_error=e)