2007-08-15 11:28:01 -03:00
|
|
|
:mod:`ftplib` --- FTP protocol client
|
|
|
|
=====================================
|
|
|
|
|
|
|
|
.. module:: ftplib
|
|
|
|
:synopsis: FTP protocol client (requires sockets).
|
|
|
|
|
|
|
|
|
|
|
|
.. index::
|
|
|
|
pair: FTP; protocol
|
|
|
|
single: FTP; ftplib (standard module)
|
|
|
|
|
|
|
|
This module defines the class :class:`FTP` and a few related items. The
|
|
|
|
:class:`FTP` class implements the client side of the FTP protocol. You can use
|
|
|
|
this to write Python programs that perform a variety of automated FTP jobs, such
|
|
|
|
as mirroring other ftp servers. It is also used by the module :mod:`urllib` to
|
|
|
|
handle URLs that use FTP. For more information on FTP (File Transfer Protocol),
|
|
|
|
see Internet :rfc:`959`.
|
|
|
|
|
|
|
|
Here's a sample session using the :mod:`ftplib` module::
|
|
|
|
|
|
|
|
>>> from ftplib import FTP
|
|
|
|
>>> ftp = FTP('ftp.cwi.nl') # connect to host, default port
|
|
|
|
>>> ftp.login() # user anonymous, passwd anonymous@
|
|
|
|
>>> ftp.retrlines('LIST') # list directory contents
|
|
|
|
total 24418
|
|
|
|
drwxrwsr-x 5 ftp-usr pdmaint 1536 Mar 20 09:48 .
|
|
|
|
dr-xr-srwt 105 ftp-usr pdmaint 1536 Mar 21 14:32 ..
|
|
|
|
-rw-r--r-- 1 ftp-usr pdmaint 5305 Mar 20 09:48 INDEX
|
|
|
|
.
|
|
|
|
.
|
|
|
|
.
|
|
|
|
>>> ftp.retrbinary('RETR README', open('README', 'wb').write)
|
|
|
|
'226 Transfer complete.'
|
|
|
|
>>> ftp.quit()
|
|
|
|
|
|
|
|
The module defines the following items:
|
|
|
|
|
|
|
|
|
|
|
|
.. class:: FTP([host[, user[, passwd[, acct[, timeout]]]]])
|
|
|
|
|
|
|
|
Return a new instance of the :class:`FTP` class. When *host* is given, the
|
2008-05-11 08:09:35 -03:00
|
|
|
method call ``connect(host)`` is made. When *user* is given, additionally
|
|
|
|
the method call ``login(user, passwd, acct)`` is made (where *passwd* and
|
|
|
|
*acct* default to the empty string when not given). The optional *timeout*
|
|
|
|
parameter specifies a timeout in seconds for blocking operations like the
|
2008-05-29 13:39:26 -03:00
|
|
|
connection attempt (if is not specified, the global default timeout setting
|
|
|
|
will be used).
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
.. versionchanged:: 2.6
|
|
|
|
*timeout* was added.
|
|
|
|
|
|
|
|
|
2008-04-24 22:29:10 -03:00
|
|
|
.. attribute:: all_errors
|
2007-08-15 11:28:01 -03:00
|
|
|
|
2008-04-24 22:29:10 -03:00
|
|
|
The set of all exceptions (as a tuple) that methods of :class:`FTP`
|
|
|
|
instances may raise as a result of problems with the FTP connection (as
|
|
|
|
opposed to programming errors made by the caller). This set includes the
|
|
|
|
four exceptions listed below as well as :exc:`socket.error` and
|
|
|
|
:exc:`IOError`.
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
|
2008-04-24 22:29:10 -03:00
|
|
|
.. exception:: error_reply
|
2007-08-15 11:28:01 -03:00
|
|
|
|
2008-04-24 22:29:10 -03:00
|
|
|
Exception raised when an unexpected reply is received from the server.
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
|
2008-04-24 22:29:10 -03:00
|
|
|
.. exception:: error_temp
|
2007-08-15 11:28:01 -03:00
|
|
|
|
2008-04-24 22:29:10 -03:00
|
|
|
Exception raised when an error code in the range 400--499 is received.
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
|
2008-04-24 22:29:10 -03:00
|
|
|
.. exception:: error_perm
|
2007-08-15 11:28:01 -03:00
|
|
|
|
2008-04-24 22:29:10 -03:00
|
|
|
Exception raised when an error code in the range 500--599 is received.
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
|
2008-04-24 22:29:10 -03:00
|
|
|
.. exception:: error_proto
|
2007-08-15 11:28:01 -03:00
|
|
|
|
2008-04-24 22:29:10 -03:00
|
|
|
Exception raised when a reply is received from the server that does not
|
|
|
|
begin with a digit in the range 1--5.
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
|
|
|
|
.. seealso::
|
|
|
|
|
|
|
|
Module :mod:`netrc`
|
|
|
|
Parser for the :file:`.netrc` file format. The file :file:`.netrc` is typically
|
|
|
|
used by FTP clients to load user authentication information before prompting the
|
|
|
|
user.
|
|
|
|
|
|
|
|
.. index:: single: ftpmirror.py
|
|
|
|
|
|
|
|
The file :file:`Tools/scripts/ftpmirror.py` in the Python source distribution is
|
|
|
|
a script that can mirror FTP sites, or portions thereof, using the :mod:`ftplib`
|
|
|
|
module. It can be used as an extended example that applies this module.
|
|
|
|
|
|
|
|
|
|
|
|
.. _ftp-objects:
|
|
|
|
|
|
|
|
FTP Objects
|
|
|
|
-----------
|
|
|
|
|
|
|
|
Several methods are available in two flavors: one for handling text files and
|
|
|
|
another for binary files. These are named for the command which is used
|
|
|
|
followed by ``lines`` for the text version or ``binary`` for the binary version.
|
|
|
|
|
|
|
|
:class:`FTP` instances have the following methods:
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.set_debuglevel(level)
|
|
|
|
|
|
|
|
Set the instance's debugging level. This controls the amount of debugging
|
|
|
|
output printed. The default, ``0``, produces no debugging output. A value of
|
|
|
|
``1`` produces a moderate amount of debugging output, generally a single line
|
|
|
|
per request. A value of ``2`` or higher produces the maximum amount of
|
|
|
|
debugging output, logging each line sent and received on the control connection.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.connect(host[, port[, timeout]])
|
|
|
|
|
|
|
|
Connect to the given host and port. The default port number is ``21``, as
|
|
|
|
specified by the FTP protocol specification. It is rarely needed to specify a
|
|
|
|
different port number. This function should be called only once for each
|
|
|
|
instance; it should not be called at all if a host was given when the instance
|
|
|
|
was created. All other methods can only be used after a connection has been
|
|
|
|
made.
|
|
|
|
|
|
|
|
The optional *timeout* parameter specifies a timeout in seconds for the
|
2008-05-29 13:39:26 -03:00
|
|
|
connection attempt. If no *timeout* is passed, the global default timeout
|
|
|
|
setting will be used.
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
.. versionchanged:: 2.6
|
|
|
|
*timeout* was added.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.getwelcome()
|
|
|
|
|
|
|
|
Return the welcome message sent by the server in reply to the initial
|
|
|
|
connection. (This message sometimes contains disclaimers or help information
|
|
|
|
that may be relevant to the user.)
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.login([user[, passwd[, acct]]])
|
|
|
|
|
|
|
|
Log in as the given *user*. The *passwd* and *acct* parameters are optional and
|
|
|
|
default to the empty string. If no *user* is specified, it defaults to
|
|
|
|
``'anonymous'``. If *user* is ``'anonymous'``, the default *passwd* is
|
|
|
|
``'anonymous@'``. This function should be called only once for each instance,
|
|
|
|
after a connection has been established; it should not be called at all if a
|
|
|
|
host and user were given when the instance was created. Most FTP commands are
|
Merged revisions 74492,74531,74545-74550,74553-74555,74588,74603,74608,74614,74616-74618,74631-74633,74652-74653,74666,74671,74737,74739,74779,74781-74782,74784,74791,74793,74818-74820,74822,74832 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74492 | r.david.murray | 2009-08-17 21:26:49 +0200 (Mo, 17 Aug 2009) | 2 lines
Issue 6685: 'toupper' -> 'upper' in cgi doc example explanation.
........
r74531 | vinay.sajip | 2009-08-21 00:04:32 +0200 (Fr, 21 Aug 2009) | 1 line
Added section on exceptions raised during logging.
........
r74545 | georg.brandl | 2009-08-24 19:14:29 +0200 (Mo, 24 Aug 2009) | 1 line
#6772: mention utf-8 as utf8 alias.
........
r74546 | georg.brandl | 2009-08-24 19:20:40 +0200 (Mo, 24 Aug 2009) | 1 line
#6725: spell "namespace" consistently.
........
r74547 | georg.brandl | 2009-08-24 19:22:05 +0200 (Mo, 24 Aug 2009) | 1 line
#6718: fix example.
........
r74548 | georg.brandl | 2009-08-24 19:24:27 +0200 (Mo, 24 Aug 2009) | 1 line
#6677: mention "deleting" as an alias for removing files.
........
r74549 | benjamin.peterson | 2009-08-24 19:42:36 +0200 (Mo, 24 Aug 2009) | 1 line
fix pdf building by teaching latex the right encoding package
........
r74550 | georg.brandl | 2009-08-24 19:48:40 +0200 (Mo, 24 Aug 2009) | 1 line
#6677: note that rmdir only removes empty directories.
........
r74553 | r.david.murray | 2009-08-27 03:04:59 +0200 (Do, 27 Aug 2009) | 2 lines
Remove leftover text from end of sentence.
........
r74554 | georg.brandl | 2009-08-27 20:59:02 +0200 (Do, 27 Aug 2009) | 1 line
Typo fix.
........
r74555 | georg.brandl | 2009-08-27 21:02:43 +0200 (Do, 27 Aug 2009) | 1 line
#6787: reference fix.
........
r74588 | georg.brandl | 2009-08-30 10:35:01 +0200 (So, 30 Aug 2009) | 1 line
#6803: fix old name.
........
r74603 | georg.brandl | 2009-08-31 08:38:29 +0200 (Mo, 31 Aug 2009) | 1 line
other -> others where multiple arguments are accepted.
........
r74608 | senthil.kumaran | 2009-08-31 18:40:27 +0200 (Mo, 31 Aug 2009) | 3 lines
Doc fix for the issue2637.
........
r74614 | georg.brandl | 2009-09-01 09:40:54 +0200 (Di, 01 Sep 2009) | 1 line
#6813: better documentation for numberless string formats.
........
r74616 | georg.brandl | 2009-09-01 09:46:26 +0200 (Di, 01 Sep 2009) | 1 line
#6808: clarification.
........
r74617 | georg.brandl | 2009-09-01 09:53:37 +0200 (Di, 01 Sep 2009) | 1 line
#6765: hint that log(x, base) is not very sophisticated.
........
r74618 | georg.brandl | 2009-09-01 10:00:47 +0200 (Di, 01 Sep 2009) | 1 line
#6810: add a link to the section about frame objects instead of just a description where to find it.
........
r74631 | georg.brandl | 2009-09-02 22:37:16 +0200 (Mi, 02 Sep 2009) | 1 line
#6821: fix signature of PyBuffer_Release().
........
r74632 | georg.brandl | 2009-09-03 09:27:26 +0200 (Do, 03 Sep 2009) | 1 line
#6828: fix wrongly highlighted blocks.
........
r74633 | georg.brandl | 2009-09-03 14:31:39 +0200 (Do, 03 Sep 2009) | 1 line
#6757: complete the list of types that marshal can serialize.
........
r74652 | georg.brandl | 2009-09-04 13:25:37 +0200 (Fr, 04 Sep 2009) | 1 line
#6756: add some info about the "acct" parameter.
........
r74653 | georg.brandl | 2009-09-04 13:32:18 +0200 (Fr, 04 Sep 2009) | 1 line
#6777: dont discourage usage of Exception.args or promote usage of Exception.message.
........
r74666 | georg.brandl | 2009-09-05 11:04:09 +0200 (Sa, 05 Sep 2009) | 1 line
#6841: remove duplicated word.
........
r74671 | georg.brandl | 2009-09-05 18:47:17 +0200 (Sa, 05 Sep 2009) | 1 line
#6843: add link from filterwarnings to where the meaning of the arguments is covered.
........
r74737 | georg.brandl | 2009-09-09 18:49:13 +0200 (Mi, 09 Sep 2009) | 1 line
Properly document copy and deepcopy as functions.
........
r74739 | georg.brandl | 2009-09-11 09:55:20 +0200 (Fr, 11 Sep 2009) | 1 line
Move function back to its section.
........
r74779 | michael.foord | 2009-09-13 18:13:36 +0200 (So, 13 Sep 2009) | 1 line
Change to tutorial wording for reading text / binary files on Windows. Issue #6301.
........
r74781 | michael.foord | 2009-09-13 18:46:19 +0200 (So, 13 Sep 2009) | 1 line
Note that sys._getframe is not guaranteed to exist in all implementations of Python, and a corresponding note in inspect.currentframe. Issue 6712.
........
r74782 | michael.foord | 2009-09-13 19:07:46 +0200 (So, 13 Sep 2009) | 1 line
Tutorial tweaks. Issue 6849.
........
r74784 | georg.brandl | 2009-09-13 20:15:07 +0200 (So, 13 Sep 2009) | 1 line
Typo fix.
........
r74791 | georg.brandl | 2009-09-14 16:08:54 +0200 (Mo, 14 Sep 2009) | 1 line
#6574: list the future features in a table.
........
r74793 | georg.brandl | 2009-09-14 16:50:47 +0200 (Mo, 14 Sep 2009) | 1 line
#6908: fix association of hashlib hash attributes.
........
r74818 | georg.brandl | 2009-09-16 11:23:04 +0200 (Mi, 16 Sep 2009) | 1 line
#6880: add reference to classes section in exceptions section, which comes earlier.
........
r74819 | georg.brandl | 2009-09-16 11:24:57 +0200 (Mi, 16 Sep 2009) | 1 line
#6876: fix base class constructor invocation in example.
........
r74820 | georg.brandl | 2009-09-16 11:30:48 +0200 (Mi, 16 Sep 2009) | 1 line
#6891: comment out dead link to Unicode article.
........
r74822 | georg.brandl | 2009-09-16 12:12:06 +0200 (Mi, 16 Sep 2009) | 1 line
#5621: refactor description of how class/instance attributes interact on a.x=a.x+1 or augassign.
........
r74832 | georg.brandl | 2009-09-16 17:57:46 +0200 (Mi, 16 Sep 2009) | 1 line
Rewrap long lines.
........
2009-10-27 11:50:20 -03:00
|
|
|
only allowed after the client has logged in. The *acct* parameter supplies
|
|
|
|
"accounting information"; few systems implement this.
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.abort()
|
|
|
|
|
|
|
|
Abort a file transfer that is in progress. Using this does not always work, but
|
|
|
|
it's worth a try.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.sendcmd(command)
|
|
|
|
|
|
|
|
Send a simple command string to the server and return the response string.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.voidcmd(command)
|
|
|
|
|
|
|
|
Send a simple command string to the server and handle the response. Return
|
|
|
|
nothing if a response code in the range 200--299 is received. Raise an exception
|
|
|
|
otherwise.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.retrbinary(command, callback[, maxblocksize[, rest]])
|
|
|
|
|
|
|
|
Retrieve a file in binary transfer mode. *command* should be an appropriate
|
|
|
|
``RETR`` command: ``'RETR filename'``. The *callback* function is called for
|
|
|
|
each block of data received, with a single string argument giving the data
|
|
|
|
block. The optional *maxblocksize* argument specifies the maximum chunk size to
|
|
|
|
read on the low-level socket object created to do the actual transfer (which
|
|
|
|
will also be the largest size of the data blocks passed to *callback*). A
|
|
|
|
reasonable default is chosen. *rest* means the same thing as in the
|
|
|
|
:meth:`transfercmd` method.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.retrlines(command[, callback])
|
|
|
|
|
2008-01-26 14:51:05 -04:00
|
|
|
Retrieve a file or directory listing in ASCII transfer mode. *command*
|
|
|
|
should be an appropriate ``RETR`` command (see :meth:`retrbinary`) or a
|
|
|
|
command such as ``LIST``, ``NLST`` or ``MLSD`` (usually just the string
|
|
|
|
``'LIST'``). The *callback* function is called for each line, with the
|
|
|
|
trailing CRLF stripped. The default *callback* prints the line to
|
|
|
|
``sys.stdout``.
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.set_pasv(boolean)
|
|
|
|
|
|
|
|
Enable "passive" mode if *boolean* is true, other disable passive mode. (In
|
|
|
|
Python 2.0 and before, passive mode was off by default; in Python 2.1 and later,
|
|
|
|
it is on by default.)
|
|
|
|
|
|
|
|
|
2008-01-26 14:51:05 -04:00
|
|
|
.. method:: FTP.storbinary(command, file[, blocksize, callback])
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
Store a file in binary transfer mode. *command* should be an appropriate
|
|
|
|
``STOR`` command: ``"STOR filename"``. *file* is an open file object which is
|
|
|
|
read until EOF using its :meth:`read` method in blocks of size *blocksize* to
|
|
|
|
provide the data to be stored. The *blocksize* argument defaults to 8192.
|
2008-01-26 14:51:05 -04:00
|
|
|
*callback* is an optional single parameter callable that is called
|
|
|
|
on each block of data after it is sent.
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
.. versionchanged:: 2.1
|
|
|
|
default for *blocksize* added.
|
|
|
|
|
2008-01-26 14:51:05 -04:00
|
|
|
.. versionchanged:: 2.6
|
|
|
|
*callback* parameter added.
|
|
|
|
|
2007-08-15 11:28:01 -03:00
|
|
|
|
2008-01-26 14:51:05 -04:00
|
|
|
.. method:: FTP.storlines(command, file[, callback])
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
Store a file in ASCII transfer mode. *command* should be an appropriate
|
|
|
|
``STOR`` command (see :meth:`storbinary`). Lines are read until EOF from the
|
|
|
|
open file object *file* using its :meth:`readline` method to provide the data to
|
2008-01-26 14:51:05 -04:00
|
|
|
be stored. *callback* is an optional single parameter callable
|
|
|
|
that is called on each line after it is sent.
|
|
|
|
|
|
|
|
.. versionchanged:: 2.6
|
|
|
|
*callback* parameter added.
|
2007-08-15 11:28:01 -03:00
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.transfercmd(cmd[, rest])
|
|
|
|
|
|
|
|
Initiate a transfer over the data connection. If the transfer is active, send a
|
|
|
|
``EPRT`` or ``PORT`` command and the transfer command specified by *cmd*, and
|
|
|
|
accept the connection. If the server is passive, send a ``EPSV`` or ``PASV``
|
|
|
|
command, connect to it, and start the transfer command. Either way, return the
|
|
|
|
socket for the connection.
|
|
|
|
|
|
|
|
If optional *rest* is given, a ``REST`` command is sent to the server, passing
|
|
|
|
*rest* as an argument. *rest* is usually a byte offset into the requested file,
|
|
|
|
telling the server to restart sending the file's bytes at the requested offset,
|
|
|
|
skipping over the initial bytes. Note however that RFC 959 requires only that
|
|
|
|
*rest* be a string containing characters in the printable range from ASCII code
|
|
|
|
33 to ASCII code 126. The :meth:`transfercmd` method, therefore, converts
|
|
|
|
*rest* to a string, but no check is performed on the string's contents. If the
|
|
|
|
server does not recognize the ``REST`` command, an :exc:`error_reply` exception
|
|
|
|
will be raised. If this happens, simply call :meth:`transfercmd` without a
|
|
|
|
*rest* argument.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.ntransfercmd(cmd[, rest])
|
|
|
|
|
|
|
|
Like :meth:`transfercmd`, but returns a tuple of the data connection and the
|
|
|
|
expected size of the data. If the expected size could not be computed, ``None``
|
|
|
|
will be returned as the expected size. *cmd* and *rest* means the same thing as
|
|
|
|
in :meth:`transfercmd`.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.nlst(argument[, ...])
|
|
|
|
|
|
|
|
Return a list of files as returned by the ``NLST`` command. The optional
|
|
|
|
*argument* is a directory to list (default is the current server directory).
|
|
|
|
Multiple arguments can be used to pass non-standard options to the ``NLST``
|
|
|
|
command.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.dir(argument[, ...])
|
|
|
|
|
|
|
|
Produce a directory listing as returned by the ``LIST`` command, printing it to
|
|
|
|
standard output. The optional *argument* is a directory to list (default is the
|
|
|
|
current server directory). Multiple arguments can be used to pass non-standard
|
|
|
|
options to the ``LIST`` command. If the last argument is a function, it is used
|
|
|
|
as a *callback* function as for :meth:`retrlines`; the default prints to
|
|
|
|
``sys.stdout``. This method returns ``None``.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.rename(fromname, toname)
|
|
|
|
|
|
|
|
Rename file *fromname* on the server to *toname*.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.delete(filename)
|
|
|
|
|
|
|
|
Remove the file named *filename* from the server. If successful, returns the
|
|
|
|
text of the response, otherwise raises :exc:`error_perm` on permission errors or
|
|
|
|
:exc:`error_reply` on other errors.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.cwd(pathname)
|
|
|
|
|
|
|
|
Set the current directory on the server.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.mkd(pathname)
|
|
|
|
|
|
|
|
Create a new directory on the server.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.pwd()
|
|
|
|
|
|
|
|
Return the pathname of the current directory on the server.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.rmd(dirname)
|
|
|
|
|
|
|
|
Remove the directory named *dirname* on the server.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.size(filename)
|
|
|
|
|
|
|
|
Request the size of the file named *filename* on the server. On success, the
|
|
|
|
size of the file is returned as an integer, otherwise ``None`` is returned.
|
|
|
|
Note that the ``SIZE`` command is not standardized, but is supported by many
|
|
|
|
common server implementations.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.quit()
|
|
|
|
|
|
|
|
Send a ``QUIT`` command to the server and close the connection. This is the
|
Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66801 | andrew.kuchling | 2008-10-04 23:51:59 +0200 (Sat, 04 Oct 2008) | 1 line
Punctuation fix; expand dict.update docstring to be clearer
................
r66803 | benjamin.peterson | 2008-10-05 00:15:31 +0200 (Sun, 05 Oct 2008) | 1 line
fix typo
................
r66804 | andrew.kuchling | 2008-10-05 02:11:56 +0200 (Sun, 05 Oct 2008) | 1 line
#1415508 from Rocky Bernstein: add docstrings for enable_interspersed_args(), disable_interspersed_args()
................
r66813 | andrew.kuchling | 2008-10-06 14:07:04 +0200 (Mon, 06 Oct 2008) | 3 lines
Per Greg Ward, optparse is no longer being externally maintained.
I'll look at the bugs in the Optik bug tracker and copy them to the Python bug
tracker if they're still relevant.
................
r66854 | georg.brandl | 2008-10-08 19:20:20 +0200 (Wed, 08 Oct 2008) | 2 lines
#4059: patch up some sqlite docs.
................
r66855 | georg.brandl | 2008-10-08 19:30:55 +0200 (Wed, 08 Oct 2008) | 2 lines
#4058: fix some whatsnew markup.
................
r66856 | georg.brandl | 2008-10-08 20:47:17 +0200 (Wed, 08 Oct 2008) | 3 lines
#3935: properly support list subclasses in the C impl. of bisect.
Patch reviewed by Raymond.
................
r66866 | benjamin.peterson | 2008-10-09 22:54:43 +0200 (Thu, 09 Oct 2008) | 1 line
update paragraph about __future__ for 2.6
................
r66870 | armin.rigo | 2008-10-10 10:40:44 +0200 (Fri, 10 Oct 2008) | 2 lines
Typo: "ThreadError" is the name in the C source.
................
r66871 | benjamin.peterson | 2008-10-10 22:38:49 +0200 (Fri, 10 Oct 2008) | 1 line
fix a small typo
................
r66872 | benjamin.peterson | 2008-10-10 22:51:37 +0200 (Fri, 10 Oct 2008) | 1 line
talk about how you can unzip with zip
................
r66874 | benjamin.peterson | 2008-10-11 00:23:41 +0200 (Sat, 11 Oct 2008) | 1 line
PyGILState_Acquire -> PyGILState_Ensure
................
r66887 | benjamin.peterson | 2008-10-13 23:51:40 +0200 (Mon, 13 Oct 2008) | 1 line
document how to disable fixers
................
r66903 | benjamin.peterson | 2008-10-15 22:34:09 +0200 (Wed, 15 Oct 2008) | 1 line
don't recurse into directories that start with '.'
................
r66905 | benjamin.peterson | 2008-10-15 23:05:55 +0200 (Wed, 15 Oct 2008) | 1 line
support the optional line argument for idle
................
r66911 | benjamin.peterson | 2008-10-16 01:10:28 +0200 (Thu, 16 Oct 2008) | 41 lines
Merged revisions 66805,66841,66860,66884-66886,66893,66907,66910 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66805 | benjamin.peterson | 2008-10-04 20:11:02 -0500 (Sat, 04 Oct 2008) | 1 line
mention what the fixes directory is for
........
r66841 | benjamin.peterson | 2008-10-07 17:48:12 -0500 (Tue, 07 Oct 2008) | 1 line
use assertFalse and assertTrue
........
r66860 | benjamin.peterson | 2008-10-08 16:05:07 -0500 (Wed, 08 Oct 2008) | 1 line
instead of abusing the pattern matcher, use start_tree to find a next binding
........
r66884 | benjamin.peterson | 2008-10-13 15:50:30 -0500 (Mon, 13 Oct 2008) | 1 line
don't print tokens to stdout when -v is given
........
r66885 | benjamin.peterson | 2008-10-13 16:28:57 -0500 (Mon, 13 Oct 2008) | 1 line
add the -x option to disable fixers
........
r66886 | benjamin.peterson | 2008-10-13 16:33:53 -0500 (Mon, 13 Oct 2008) | 1 line
cut down on some crud
........
r66893 | benjamin.peterson | 2008-10-14 17:16:54 -0500 (Tue, 14 Oct 2008) | 1 line
add an optional set literal fixer
........
r66907 | benjamin.peterson | 2008-10-15 16:59:41 -0500 (Wed, 15 Oct 2008) | 1 line
don't write backup files by default
........
r66910 | benjamin.peterson | 2008-10-15 17:43:10 -0500 (Wed, 15 Oct 2008) | 1 line
add the -n option; it stops backupfiles from being written
........
................
r66913 | benjamin.peterson | 2008-10-16 20:52:14 +0200 (Thu, 16 Oct 2008) | 1 line
document that deque indexing is O(n) #4123
................
r66927 | andrew.kuchling | 2008-10-16 22:15:47 +0200 (Thu, 16 Oct 2008) | 1 line
Fix wording (2.6.1 backport candidate)
................
r66932 | benjamin.peterson | 2008-10-16 23:09:28 +0200 (Thu, 16 Oct 2008) | 1 line
check for error conditions in _json #3623
................
r66938 | benjamin.peterson | 2008-10-16 23:27:54 +0200 (Thu, 16 Oct 2008) | 1 line
fix possible ref leak
................
r66942 | benjamin.peterson | 2008-10-16 23:48:06 +0200 (Thu, 16 Oct 2008) | 1 line
fix more possible ref leaks in _json and use Py_CLEAR
................
r66962 | benjamin.peterson | 2008-10-17 22:01:01 +0200 (Fri, 17 Oct 2008) | 1 line
clarify CALL_FUNCTION #4141
................
r66964 | georg.brandl | 2008-10-17 23:41:49 +0200 (Fri, 17 Oct 2008) | 2 lines
Fix duplicate word.
................
r66973 | armin.ronacher | 2008-10-19 10:27:43 +0200 (Sun, 19 Oct 2008) | 3 lines
Fixed #4067 by implementing _attributes and _fields for the AST root node.
................
r66974 | benjamin.peterson | 2008-10-19 15:59:01 +0200 (Sun, 19 Oct 2008) | 1 line
fix compiler warning
................
r66977 | benjamin.peterson | 2008-10-19 21:39:16 +0200 (Sun, 19 Oct 2008) | 1 line
mention -n
................
r66992 | benjamin.peterson | 2008-10-21 22:51:13 +0200 (Tue, 21 Oct 2008) | 1 line
make sure to call iteritems()
................
r66998 | benjamin.peterson | 2008-10-22 22:57:43 +0200 (Wed, 22 Oct 2008) | 1 line
fix a few typos
................
r66999 | benjamin.peterson | 2008-10-22 23:05:30 +0200 (Wed, 22 Oct 2008) | 1 line
and another typo...
................
r67002 | hirokazu.yamamoto | 2008-10-23 02:37:33 +0200 (Thu, 23 Oct 2008) | 1 line
Issue #4183: Some tests didn't run with pickle.HIGHEST_PROTOCOL.
................
r67005 | walter.doerwald | 2008-10-23 15:11:39 +0200 (Thu, 23 Oct 2008) | 2 lines
Use the correct names of the stateless codec functions (Fixes issue 4178).
................
r67007 | benjamin.peterson | 2008-10-23 23:43:48 +0200 (Thu, 23 Oct 2008) | 1 line
only nonempty __slots__ don't work
................
r67028 | benjamin.peterson | 2008-10-26 01:27:07 +0200 (Sun, 26 Oct 2008) | 1 line
don't use a catch-all
................
r67040 | armin.rigo | 2008-10-28 18:01:21 +0100 (Tue, 28 Oct 2008) | 5 lines
Fix one of the tests: it relied on being present in an "output test" in
order to actually test what it was supposed to test, i.e. that the code
in the __del__ method did not crash. Use instead the new helper
test_support.captured_output().
................
r67041 | benjamin.peterson | 2008-10-29 21:33:00 +0100 (Wed, 29 Oct 2008) | 1 line
mention the version gettempdir() was added
................
r67044 | amaury.forgeotdarc | 2008-10-30 00:15:57 +0100 (Thu, 30 Oct 2008) | 3 lines
Correct error message in io.open():
closefd=True is the only accepted value with a file name.
................
r67070 | benjamin.peterson | 2008-10-31 21:41:44 +0100 (Fri, 31 Oct 2008) | 1 line
rephrase has_key doc
................
r67089 | benjamin.peterson | 2008-11-03 21:43:20 +0100 (Mon, 03 Nov 2008) | 1 line
clarify by splitting into multiple paragraphs
................
r67091 | benjamin.peterson | 2008-11-03 23:34:57 +0100 (Mon, 03 Nov 2008) | 1 line
move a FileIO test to test_fileio
................
r67101 | georg.brandl | 2008-11-04 21:49:35 +0100 (Tue, 04 Nov 2008) | 2 lines
#4167: fix markup glitches.
................
r67117 | georg.brandl | 2008-11-06 11:17:58 +0100 (Thu, 06 Nov 2008) | 2 lines
#4268: Use correct module for two toplevel functions.
................
r67118 | georg.brandl | 2008-11-06 11:19:11 +0100 (Thu, 06 Nov 2008) | 2 lines
#4267: small fixes in sqlite3 docs.
................
r67119 | georg.brandl | 2008-11-06 11:20:49 +0100 (Thu, 06 Nov 2008) | 2 lines
#4245: move Thread section to the top.
................
r67123 | georg.brandl | 2008-11-06 19:49:15 +0100 (Thu, 06 Nov 2008) | 2 lines
#4247: add "pass" examples to tutorial.
................
r67124 | andrew.kuchling | 2008-11-06 20:23:02 +0100 (Thu, 06 Nov 2008) | 1 line
Fix grammar error; reword two paragraphs
................
2008-11-07 04:56:27 -04:00
|
|
|
"polite" way to close a connection, but it may raise an exception if the server
|
2008-07-12 17:16:19 -03:00
|
|
|
responds with an error to the ``QUIT`` command. This implies a call to the
|
2007-08-15 11:28:01 -03:00
|
|
|
:meth:`close` method which renders the :class:`FTP` instance useless for
|
|
|
|
subsequent calls (see below).
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: FTP.close()
|
|
|
|
|
|
|
|
Close the connection unilaterally. This should not be applied to an already
|
|
|
|
closed connection such as after a successful call to :meth:`quit`. After this
|
|
|
|
call the :class:`FTP` instance should not be used any more (after a call to
|
|
|
|
:meth:`close` or :meth:`quit` you cannot reopen the connection by issuing
|
|
|
|
another :meth:`login` method).
|
|
|
|
|