summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_ftplib.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-12-06 03:11:33 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-12-06 03:11:33 (GMT)
commit22293df016773029385c70968252a11b7cb02a42 (patch)
tree5611857cbd58ca2989fddd38a43ed745ac9d30d0 /Lib/test/test_ftplib.py
parent4becc38ad15d4e066f1b141cada8f5d76797cae4 (diff)
parente32467cf6af3e6d113ae2cfd886e403828e23fed (diff)
downloadcpython-22293df016773029385c70968252a11b7cb02a42.zip
cpython-22293df016773029385c70968252a11b7cb02a42.tar.gz
cpython-22293df016773029385c70968252a11b7cb02a42.tar.bz2
merge 3.4 (#22935)
Diffstat (limited to 'Lib/test/test_ftplib.py')
-rw-r--r--Lib/test/test_ftplib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index 5db70c0..aef66da 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -889,7 +889,7 @@ class TestTLS_FTPClass(TestCase):
def test_auth_ssl(self):
try:
- self.client.ssl_version = ssl.PROTOCOL_SSLv3
+ self.client.ssl_version = ssl.PROTOCOL_SSLv23
self.client.auth()
self.assertRaises(ValueError, self.client.auth)
finally: