← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/ftp_server/__init__.py

Committer: Patch Queue Manager
Date: 2012-03-15 18:40:57 UTC
mfrom: (6437.51.1 956027-pyftpdlib)
mto: (6507.1.1 trunk) (6437.54.1 2.5) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6508.
Revision ID: pqm@pqm.ubuntu.com-20120315184057-1grgcn2ubniptfuv

(vila) Support pyftpdlib >= 0.7.0 as an ftp test server (Vincent Ladeuil)

files modified:
bzrlib/tests/ftp_server/__init__.py

bzrlib/tests/ftp_server/pyftpdlib_based.py

doc/en/release-notes/bzr-2.5.txt

Show diffs side-by-side

added added

removed removed

bzrlib/tests/ftp_server/__init__.py

41

41

42

42

try:

43

43

from bzrlib.tests.ftp_server import pyftpdlib_based

44

pyftpdlib_available = True

44

if pyftpdlib_based.pyftplib_version >= (0, 7, 0):

45

pyftpdlib_available = True

46

else:

47

# 0.6.0 breaks SITE CHMOD

48

pyftpdlib_available = False

45

49

except ImportError:

46

50

pyftpdlib_available = False

47

51

Older »