← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
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