Commit Graph

147 Commits

Author SHA1 Message Date
Benjamin Peterson bfdec6263f merge 3.4 (#23111) 2014-12-30 15:16:13 -06:00
Benjamin Peterson 36fe7926f8 make PROTOCOL_SSLv23 the default protocol version for ftplib (closes #23111) 2014-12-30 15:15:43 -06:00
Benjamin Peterson 7243b574e5 don't require OpenSSL SNI to pass hostname to ssl functions (#22921)
Patch by Donald Stufft.
2014-11-23 17:04:34 -06:00
Benjamin Peterson f9284ae8ed merge 3.4 (#22921) 2014-11-23 17:06:39 -06:00
Berker Peksag 8f791d358b Issue #6623: Remove deprecated Netrc class in the ftplib module.
Patch by Matt Chaput.
2014-11-01 10:45:57 +02:00
Victor Stinner 69b1e261fc Issue #20978: pyflakes: fix undefined names 2014-03-20 08:50:52 +01:00
Christian Heimes e5b5edfa2c Issue #19781: ftplib now supports SSLContext.check_hostname and server name
indication for TLS/SSL connections.
2013-12-02 02:56:02 +01:00
Christian Heimes 67986f9431 Issue #19735: Implement private function ssl._create_stdlib_context() to
create SSLContext objects in Python's stdlib module. It provides a single
configuration point and makes use of SSLContext.load_default_certs().
2013-11-23 22:43:47 +01:00
Serhiy Storchaka 2acc456c33 Issue #16038: CVE-2013-1752: ftplib: Limit amount of data read by
limiting the call to readline().  Original patch by Michał
Jastrzębski and Giampaolo Rodola.
2013-10-20 17:02:10 +03:00
Serhiy Storchaka c30b178cbc Issue #16038: CVE-2013-1752: ftplib: Limit amount of data read by
limiting the call to readline().  Original patch by Michał
Jastrzębski and Giampaolo Rodola.
2013-10-20 16:58:27 +03:00
Brett Cannon cd171c8e92 Issue #18200: Back out usage of ModuleNotFoundError (8d28d44f3a9a) 2013-07-04 17:43:24 -04:00
Brett Cannon 0a140668fa Issue #18200: Update the stdlib (except tests) to use
ModuleNotFoundError.
2013-06-13 20:57:26 -04:00
Giampaolo Rodola' 11a9bd62b1 ftplib: update connect() docstring by mentioning 'timeout' argument 2013-04-26 15:23:43 +02:00
Giampaolo Rodola' a77d7a52e8 (issue 17452 / ftplib) fix TypeError occurring in case ssl module is not installed 2013-03-18 09:59:15 +01:00
Terry Jan Reedy 16b5c13668 Merge 3.3, issue #17047: remove doubled words found in 2.7 to
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.
2013-03-11 17:59:07 -04:00
Terry Jan Reedy 98472b8396 Merge 3.2, issue #17047: remove doubled words found in 2.7 to
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.
2013-03-11 17:58:27 -04:00
Terry Jan Reedy c30b7b16ea Issue #17047: remove doubled words found in 2.7 to 3.4 Lib/*,
as reported by Serhiy Storchaka and Matthew Barnett.
2013-03-11 17:57:08 -04:00
Giampaolo Rodola' 3ff5e7578e Refactor ftplib by getting rid of 4 methods (retr*() and stor*()) which were duplicated in TLS_FTP class. 2013-03-07 14:03:27 +01:00
Giampaolo Rodola' 94c56a172c PEP8-ify ftplib.py: get rid of multiple statements on one line (if cond: ...) 2013-03-07 13:51:20 +01:00
R David Murray 87632f1a9e #6623: Add explicit deprecation warning for ftplib.Netrc. 2013-02-19 18:32:28 -05:00
Andrew Svetlov f7a17b48d7 Replace IOError with OSError (#16715) 2012-12-25 16:47:37 +02:00
Andrew Svetlov 0832af6628 Issue #16717: get rid of socket.error, replace with OSError 2012-12-18 23:10:48 +02:00
Giampaolo Rodola' b6375a2d91 Issue 16646 (ftplib): deliberately use intermediate variable after catching exception 2012-12-17 20:46:29 +01:00
Giampaolo Rodola' 57f3487994 Issue 16646 (ftplib): deliberately use intermediate variable after catching exception 2012-12-17 20:46:16 +01:00
Giampaolo Rodola' 896cb15d0c Fix issue #16646: ftplib.FTP.makeport() might lose socket error details. (patch by Serhiy Storchaka) 2012-12-17 14:22:19 +01:00
Giampaolo Rodola' fc3278802c Fix issue #16646: ftplib.FTP.makeport() might lose socket error details. (patch by Serhiy Storchaka) 2012-12-17 14:20:27 +01:00
Giampaolo Rodola' 836e9aab2f fix #13563: make use of with statement in ftplib.py where needed 2011-12-10 21:25:04 +01:00
Florent Xicluna 2bb96f593a Cleanup code: remove int/long idioms and simplify a while statement. 2011-10-23 22:11:00 +02:00
Nadeem Vawda 0200016132 Merge: #10883: Fix socket leaks in urllib.request.
* ftpwrapper now uses reference counting to ensure that the underlying socket
  is closed when the ftpwrapper object is no longer in use
* ftplib.FTP.ntransfercmd() now closes the socket if an error occurs

Initial patch by Victor Stinner.
2011-07-23 14:25:45 +02:00
Nadeem Vawda 08f5f7aa81 Issue #10883: Fix socket leaks in urllib.request.
* ftpwrapper now uses reference counting to ensure that the underlying socket
  is closed when the ftpwrapper object is no longer in use
* ftplib.FTP.ntransfercmd() now closes the socket if an error occurs

Initial patch by Victor Stinner.
2011-07-23 14:03:00 +02:00
Giampaolo Rodola' 096dcb1eff Issue 12139: add CCC command support to FTP_TLS class to revert the SSL connection back to clear-text. 2011-06-27 11:17:51 +02:00
Giampaolo Rodola' ffc235cbbf merge with 3.2 2011-05-07 19:11:06 +02:00
Giampaolo Rodola' 24befa87dc merge with 3.1 2011-05-07 19:09:34 +02:00
Giampaolo Rodola' 0b5c21f9c9 #12002 - ftplib's abort() method raises TypeError 2011-05-07 19:03:47 +02:00
Giampaolo Rodola' d78def9474 Issue #11072: added MLSD command (RFC-3659) support to ftplib. 2011-05-06 19:49:08 +02:00
Ezio Melotti 4969f709cc #11515: Merge with 3.1. 2011-03-15 05:59:46 +02:00
Ezio Melotti 373089239b #11515: Merge with 3.2. 2011-03-15 06:03:08 +02:00
Giampaolo Rodolà 396ff06051 Fix issue 8594: adds a source_address parameter to ftplib module. 2011-02-28 19:19:51 +00:00
Marc-André Lemburg 8f36af7a4c Normalize the encoding names for Latin-1 and UTF-8 to
'latin-1' and 'utf-8'.

These are optimized in the Python Unicode implementation
to result in more direct processing, bypassing the codec
registry.

Also see issue11303.
2011-02-25 15:42:01 +00:00
Giampaolo Rodolà d686848807 In FTP.close() method, make sure to also close the socket object, not only the file. 2011-02-22 19:24:33 +00:00
Benjamin Peterson 1bd93a754f fix ftplib resource warnings 2010-10-31 19:58:07 +00:00
Benjamin Peterson a807137c39 wrap some things in with blocks 2010-10-31 18:21:16 +00:00
Raymond Hettinger d5825ccd40 Take advantage of the frozenset constant optimization. 2010-09-05 23:15:06 +00:00
Giampaolo Rodolà bbc4782d77 fix issue 9601: ftplib now provides a workaround for invalid response code returned on MKD and PWD by non-compliant FTPserver implementations such as ISS shipped with Windows server 2003 2010-08-23 22:10:32 +00:00
Giampaolo Rodolà 6545ed6e4f remove obsolete 'import SOCKS' statement 2010-08-21 20:34:37 +00:00
Giampaolo Rodolà f96482e91a as per discussion with antoine revert changes made in 83708 as the user useing ftplib's readline methods is supposed to always use a binary file 2010-08-04 10:36:18 +00:00
Giampaolo Rodolà b939235c6a fix issue #6822: ftplib's storline method doesn't work with text files 2010-08-04 10:12:00 +00:00
Giampaolo Rodolà a67299e757 Fix issue #8806: add SSL contexts support to ftplib 2010-05-26 18:06:04 +00:00
Giampaolo Rodolà bd576b75b7 Fix issue #4972: adds ftplib.FTP context manager protocol 2010-05-10 14:53:29 +00:00
Giampaolo Rodolà f527940dbd Merged revisions 80228 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80228 | giampaolo.rodola | 2010-04-20 00:05:54 +0200 (mar, 20 apr 2010) | 9 lines

  Merged revisions 80226 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80226 | giampaolo.rodola | 2010-04-19 23:46:28 +0200 (lun, 19 apr 2010) | 1 line

    Fix Issue #4841: timeout is now applied for connections resulting from PORT/EPRT commands
  ........
................
2010-04-19 22:10:56 +00:00