At file:///net/bigmamac/Volumes/home/vila/src/bzr/experimental/more-ftp/
------------------------------------------------------------
revno: 3517
revision-id: [email protected]
parent: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: pyftpdlib
timestamp: Sat 2009-02-28 22:43:20 +0100
message:
Merge disable-medusa-for-python-2.6 into pyftpdlib
modified:
bzrlib/tests/ftp_server/__init__.py
__init__.py-20090227130107-4gcpgvr00l7v3fsw-1
------------------------------------------------------------
revno: 3508.1.557
revision-id: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: disable-medusa-for-python-2.6
timestamp: Sat 2009-02-28 22:43:00 +0100
message:
Disable medusa under python2.6 until we find or replacement or it get
fixed.
* bzrlib/tests/ftp_server/__init__.py:
Disable medusa under python2.6.
modified:
bzrlib/tests/ftp_server/__init__.py
__init__.py-20090227130107-4gcpgvr00l7v3fsw-1
------------------------------------------------------------
revno: 3508.1.556
revision-id: [email protected]
parent: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: disable-medusa-for-python-2.6
timestamp: Sat 2009-02-28 22:01:58 +0100
message:
split pyftpdlib thread to isolate medusa related changes
added:
bzrlib/tests/ftp_server/
ftp_server-20090227112800-4r9jkezw2hw9tij7-1
bzrlib/tests/ftp_server/__init__.py
__init__.py-20090227130107-4gcpgvr00l7v3fsw-1
renamed:
bzrlib/tests/ftp_server.py => bzrlib/tests/ftp_server/medusa_based.py
ftpserver.py-20071019102346-61jbvdkrr70igauv-1
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_ftp_transport.py
test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/tests/ftp_server/medusa_based.py
ftpserver.py-20071019102346-61jbvdkrr70igauv-1
=== modified file 'bzrlib/tests/ftp_server/__init__.py'
--- a/bzrlib/tests/ftp_server/__init__.py 2009-02-27 13:26:13 +0000
+++ b/bzrlib/tests/ftp_server/__init__.py 2009-02-28 21:43:00 +0000
@@ -17,12 +17,15 @@
Facilities to use ftp test servers.
"""
+import sys
+
from bzrlib import tests
try:
from bzrlib.tests.ftp_server import medusa_based
- medusa_available = True
+ # medusa is bogus under python2.6
+ medusa_available = sys.version_info <= (2, 5)
except ImportError:
medusa_available = False
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
