1998-04-09 21:51:46 +08:00
|
|
|
"""IMAP4 client.
|
|
|
|
|
|
|
|
Based on RFC 2060.
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
Public class: IMAP4
|
|
|
|
Public variable: Debug
|
|
|
|
Public functions: Internaldate2tuple
|
|
|
|
Int2AP
|
|
|
|
ParseFlags
|
|
|
|
Time2Internaldate
|
1998-04-09 21:51:46 +08:00
|
|
|
"""
|
1998-06-25 10:22:16 +08:00
|
|
|
|
2000-02-28 23:12:25 +08:00
|
|
|
# Author: Piers Lauder <piers@cs.su.oz.au> December 1997.
|
2001-01-15 07:47:14 +08:00
|
|
|
#
|
2000-02-28 23:12:25 +08:00
|
|
|
# Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998.
|
2001-02-09 14:50:21 +08:00
|
|
|
# String method conversion by ESR, February 2001.
|
2001-07-20 18:52:06 +08:00
|
|
|
# GET/SETACL contributed by Anthony Baxter <anthony@interlink.com.au> April 2001.
|
2002-03-08 09:53:24 +08:00
|
|
|
# IMAP4_SSL contributed by Tino Lange <Tino.Lange@isg.de> March 2002.
|
2002-06-17 15:07:20 +08:00
|
|
|
# GET/SETQUOTA contributed by Andreas Zeidler <az@kreativkombinat.de> June 2002.
|
2002-11-22 13:53:04 +08:00
|
|
|
# PROXYAUTH contributed by Rick Holbert <holbert.13@osu.edu> November 2002.
|
2005-06-02 07:50:52 +08:00
|
|
|
# GET/SETANNOTATION contributed by Tomas Lindroos <skitta@abo.fi> June 2005.
|
2000-02-28 23:12:25 +08:00
|
|
|
|
2005-08-31 18:50:03 +08:00
|
|
|
__version__ = "2.58"
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2012-04-30 03:56:49 +08:00
|
|
|
import binascii, errno, random, re, socket, subprocess, sys, time, calendar
|
2012-06-23 09:03:39 +08:00
|
|
|
from datetime import datetime, timezone, timedelta
|
2013-03-20 01:52:33 +08:00
|
|
|
from io import DEFAULT_BUFFER_SIZE
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2010-11-13 02:49:16 +08:00
|
|
|
try:
|
|
|
|
import ssl
|
|
|
|
HAVE_SSL = True
|
2013-07-05 05:43:24 +08:00
|
|
|
except ImportError:
|
2010-11-13 02:49:16 +08:00
|
|
|
HAVE_SSL = False
|
|
|
|
|
Merged revisions 57620-57771 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57771 | thomas.wouters | 2007-08-30 23:54:39 +0200 (Thu, 30 Aug 2007) | 5 lines
Don't lie in __all__ attributes when SSL is not available: only add the SSL
classes when they are actually created.
........
r57620 | walter.doerwald | 2007-08-28 18:38:26 +0200 (Tue, 28 Aug 2007) | 5 lines
Fix title endtag in HTMLCalender.formatyearpage(). Fix documentation for
HTMLCalender.formatyearpage() (there's no themonth parameter).
This fixes issue1046.
........
r57622 | georg.brandl | 2007-08-28 20:54:44 +0200 (Tue, 28 Aug 2007) | 2 lines
Add a crasher for the thread-unsafety of file objects.
........
r57626 | skip.montanaro | 2007-08-29 01:22:52 +0200 (Wed, 29 Aug 2007) | 1 line
fixes 813986
........
r57628 | walter.doerwald | 2007-08-29 01:35:33 +0200 (Wed, 29 Aug 2007) | 2 lines
Fix test output.
........
r57631 | skip.montanaro | 2007-08-29 03:24:11 +0200 (Wed, 29 Aug 2007) | 2 lines
Install pygettext (once the scriptsinstall target is working again).
........
r57633 | skip.montanaro | 2007-08-29 03:33:45 +0200 (Wed, 29 Aug 2007) | 2 lines
Recent items.
........
r57650 | neal.norwitz | 2007-08-29 08:15:33 +0200 (Wed, 29 Aug 2007) | 1 line
Add Bill as a developer
........
r57651 | facundo.batista | 2007-08-29 12:28:28 +0200 (Wed, 29 Aug 2007) | 5 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised during FailingServerTestCase tests.
[GSoC - Alan McIntyre]
........
r57680 | bill.janssen | 2007-08-30 00:35:05 +0200 (Thu, 30 Aug 2007) | 17 lines
This contains a number of things:
1) Improve the documentation of the SSL module, with a fuller
explanation of certificate usage, another reference, proper
formatting of this and that.
2) Fix Windows bug in ssl.py, and general bug in sslsocket.close().
Remove some unused code from ssl.py. Allow accept() to be called on
sslsocket sockets.
3) Use try-except-else in import of ssl in socket.py. Deprecate use of
socket.ssl().
4) Remove use of socket.ssl() in every library module, except for
test_socket_ssl.py and test_ssl.py.
........
r57714 | georg.brandl | 2007-08-30 12:09:42 +0200 (Thu, 30 Aug 2007) | 2 lines
Stronger urge to convert filenames to str before using them as argument to ZipFile.write().
........
r57716 | georg.brandl | 2007-08-30 12:38:56 +0200 (Thu, 30 Aug 2007) | 2 lines
Patch #1680959: add test suite for pipes module.
........
r57717 | georg.brandl | 2007-08-30 14:32:23 +0200 (Thu, 30 Aug 2007) | 3 lines
* Skip test_pipes on non-POSIX.
* Don't raise TestSkipped within a test function.
........
r57723 | mark.summerfield | 2007-08-30 17:03:03 +0200 (Thu, 30 Aug 2007) | 3 lines
Added more cross-references.
........
r57726 | walter.doerwald | 2007-08-30 17:30:09 +0200 (Thu, 30 Aug 2007) | 2 lines
Rewrap line.
........
r57727 | walter.doerwald | 2007-08-30 17:34:55 +0200 (Thu, 30 Aug 2007) | 2 lines
Set startinpos before calling the error handler.
........
r57730 | bill.janssen | 2007-08-30 19:07:28 +0200 (Thu, 30 Aug 2007) | 3 lines
Added docstrings to methods and functions.
........
r57743 | bill.janssen | 2007-08-30 20:08:06 +0200 (Thu, 30 Aug 2007) | 1 line
added note on new ssl module and deprecation of socket.ssl
........
r57747 | martin.v.loewis | 2007-08-30 20:14:01 +0200 (Thu, 30 Aug 2007) | 1 line
Fix popen usage.
........
r57748 | martin.v.loewis | 2007-08-30 20:15:22 +0200 (Thu, 30 Aug 2007) | 1 line
Fix typo.
........
r57750 | martin.v.loewis | 2007-08-30 20:25:47 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1746880: Correctly install DLLs into system32 folder on Win64.
........
r57760 | martin.v.loewis | 2007-08-30 21:04:09 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1709599: Run test_1565150 only if the file system is NTFS.
........
r57762 | martin.v.loewis | 2007-08-30 22:10:57 +0200 (Thu, 30 Aug 2007) | 2 lines
Bump autoconf minimum version to 2.61.
........
r57764 | lars.gustaebel | 2007-08-30 22:24:31 +0200 (Thu, 30 Aug 2007) | 2 lines
Warn about possible risks when extracting untrusted archives.
........
r57769 | thomas.wouters | 2007-08-30 23:01:17 +0200 (Thu, 30 Aug 2007) | 7 lines
Somewhat-preliminary slice-object and extended slicing support for ctypes.
The exact behaviour of omitted and negative indices for the Pointer type may
need a closer look (especially as it's subtly different from simple slices)
but there's time yet before 2.6, and not enough before 3.0a1 :-)
........
2007-08-31 06:15:33 +08:00
|
|
|
__all__ = ["IMAP4", "IMAP4_stream", "Internaldate2tuple",
|
2001-01-24 12:16:09 +08:00
|
|
|
"Int2AP", "ParseFlags", "Time2Internaldate"]
|
2001-01-23 23:35:05 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Globals
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2008-11-06 03:39:50 +08:00
|
|
|
CRLF = b'\r\n'
|
1998-04-09 21:51:46 +08:00
|
|
|
Debug = 0
|
|
|
|
IMAP4_PORT = 143
|
2002-03-08 17:05:12 +08:00
|
|
|
IMAP4_SSL_PORT = 993
|
2001-01-15 07:47:14 +08:00
|
|
|
AllowedVersions = ('IMAP4REV1', 'IMAP4') # Most recent first
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2013-10-27 13:52:14 +08:00
|
|
|
# Maximal line length when calling readline(). This is to prevent
|
|
|
|
# reading arbitrary length lines. RFC 3501 and 2060 (IMAP 4rev1)
|
2015-03-23 04:17:46 +08:00
|
|
|
# don't specify a line length. RFC 2683 suggests limiting client
|
|
|
|
# command lines to 1000 octets and that servers should be prepared
|
|
|
|
# to accept command lines up to 8000 octets, so we used to use 10K here.
|
|
|
|
# In the modern world (eg: gmail) the response to, for example, a
|
|
|
|
# search command can be quite large, so we now use 1M.
|
|
|
|
_MAXLINE = 1000000
|
2013-10-27 13:52:14 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Commands
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
Commands = {
|
2001-01-15 07:47:14 +08:00
|
|
|
# name valid states
|
|
|
|
'APPEND': ('AUTH', 'SELECTED'),
|
|
|
|
'AUTHENTICATE': ('NONAUTH',),
|
|
|
|
'CAPABILITY': ('NONAUTH', 'AUTH', 'SELECTED', 'LOGOUT'),
|
|
|
|
'CHECK': ('SELECTED',),
|
|
|
|
'CLOSE': ('SELECTED',),
|
|
|
|
'COPY': ('SELECTED',),
|
|
|
|
'CREATE': ('AUTH', 'SELECTED'),
|
|
|
|
'DELETE': ('AUTH', 'SELECTED'),
|
2004-07-27 13:07:19 +08:00
|
|
|
'DELETEACL': ('AUTH', 'SELECTED'),
|
2015-05-11 07:17:23 +08:00
|
|
|
'ENABLE': ('AUTH', ),
|
2001-01-15 07:47:14 +08:00
|
|
|
'EXAMINE': ('AUTH', 'SELECTED'),
|
|
|
|
'EXPUNGE': ('SELECTED',),
|
|
|
|
'FETCH': ('SELECTED',),
|
2001-07-20 18:52:06 +08:00
|
|
|
'GETACL': ('AUTH', 'SELECTED'),
|
2005-06-02 07:50:52 +08:00
|
|
|
'GETANNOTATION':('AUTH', 'SELECTED'),
|
2002-06-17 15:07:20 +08:00
|
|
|
'GETQUOTA': ('AUTH', 'SELECTED'),
|
|
|
|
'GETQUOTAROOT': ('AUTH', 'SELECTED'),
|
2004-07-27 13:07:19 +08:00
|
|
|
'MYRIGHTS': ('AUTH', 'SELECTED'),
|
2001-01-15 07:47:14 +08:00
|
|
|
'LIST': ('AUTH', 'SELECTED'),
|
|
|
|
'LOGIN': ('NONAUTH',),
|
|
|
|
'LOGOUT': ('NONAUTH', 'AUTH', 'SELECTED', 'LOGOUT'),
|
|
|
|
'LSUB': ('AUTH', 'SELECTED'),
|
2001-07-20 18:52:06 +08:00
|
|
|
'NAMESPACE': ('AUTH', 'SELECTED'),
|
2001-01-15 07:47:14 +08:00
|
|
|
'NOOP': ('NONAUTH', 'AUTH', 'SELECTED', 'LOGOUT'),
|
2002-02-22 09:15:17 +08:00
|
|
|
'PARTIAL': ('SELECTED',), # NB: obsolete
|
2002-11-22 13:53:04 +08:00
|
|
|
'PROXYAUTH': ('AUTH',),
|
2001-01-15 07:47:14 +08:00
|
|
|
'RENAME': ('AUTH', 'SELECTED'),
|
|
|
|
'SEARCH': ('SELECTED',),
|
|
|
|
'SELECT': ('AUTH', 'SELECTED'),
|
2001-07-20 18:52:06 +08:00
|
|
|
'SETACL': ('AUTH', 'SELECTED'),
|
2005-06-02 07:50:52 +08:00
|
|
|
'SETANNOTATION':('AUTH', 'SELECTED'),
|
2002-06-17 15:07:20 +08:00
|
|
|
'SETQUOTA': ('AUTH', 'SELECTED'),
|
2001-07-20 18:52:06 +08:00
|
|
|
'SORT': ('SELECTED',),
|
2010-11-13 02:49:16 +08:00
|
|
|
'STARTTLS': ('NONAUTH',),
|
2001-01-15 07:47:14 +08:00
|
|
|
'STATUS': ('AUTH', 'SELECTED'),
|
|
|
|
'STORE': ('SELECTED',),
|
|
|
|
'SUBSCRIBE': ('AUTH', 'SELECTED'),
|
2003-11-10 14:44:44 +08:00
|
|
|
'THREAD': ('SELECTED',),
|
2001-01-15 07:47:14 +08:00
|
|
|
'UID': ('SELECTED',),
|
|
|
|
'UNSUBSCRIBE': ('AUTH', 'SELECTED'),
|
|
|
|
}
|
|
|
|
|
|
|
|
# Patterns to match server responses
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2008-11-06 03:39:50 +08:00
|
|
|
Continuation = re.compile(br'\+( (?P<data>.*))?')
|
|
|
|
Flags = re.compile(br'.*FLAGS \((?P<flags>[^\)]*)\)')
|
|
|
|
InternalDate = re.compile(br'.*INTERNALDATE "'
|
|
|
|
br'(?P<day>[ 0123][0-9])-(?P<mon>[A-Z][a-z][a-z])-(?P<year>[0-9][0-9][0-9][0-9])'
|
|
|
|
br' (?P<hour>[0-9][0-9]):(?P<min>[0-9][0-9]):(?P<sec>[0-9][0-9])'
|
|
|
|
br' (?P<zonen>[-+])(?P<zoneh>[0-9][0-9])(?P<zonem>[0-9][0-9])'
|
|
|
|
br'"')
|
2015-05-11 07:17:23 +08:00
|
|
|
# Literal is no longer used; kept for backward compatibility.
|
2008-11-06 03:39:50 +08:00
|
|
|
Literal = re.compile(br'.*{(?P<size>\d+)}$', re.ASCII)
|
|
|
|
MapCRLF = re.compile(br'\r\n|\r|\n')
|
2016-01-03 06:18:34 +08:00
|
|
|
# We no longer exclude the ']' character from the data portion of the response
|
|
|
|
# code, even though it violates the RFC. Popular IMAP servers such as Gmail
|
|
|
|
# allow flags with ']', and there are programs (including imaplib!) that can
|
|
|
|
# produce them. The problem with this is if the 'text' portion of the response
|
|
|
|
# includes a ']' we'll parse the response wrong (which is the point of the RFC
|
|
|
|
# restriction). However, that seems less likely to be a problem in practice
|
|
|
|
# than being unable to correctly parse flags that include ']' chars, which
|
|
|
|
# was reported as a real-world problem in issue #21815.
|
|
|
|
Response_code = re.compile(br'\[(?P<type>[A-Z-]+)( (?P<data>.*))?\]')
|
2008-11-06 03:39:50 +08:00
|
|
|
Untagged_response = re.compile(br'\* (?P<type>[A-Z-]+)( (?P<data>.*))?')
|
2015-05-11 07:17:23 +08:00
|
|
|
# Untagged_status is no longer used; kept for backward compatibility
|
2008-08-20 01:56:33 +08:00
|
|
|
Untagged_status = re.compile(
|
2008-11-06 03:39:50 +08:00
|
|
|
br'\* (?P<data>\d+) (?P<type>[A-Z-]+)( (?P<data2>.*))?', re.ASCII)
|
2015-05-11 07:17:23 +08:00
|
|
|
# We compile these in _mode_xxx.
|
|
|
|
_Literal = br'.*{(?P<size>\d+)}$'
|
|
|
|
_Untagged_status = br'\* (?P<data>\d+) (?P<type>[A-Z-]+)( (?P<data2>.*))?'
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class IMAP4:
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
"""IMAP4 client class.
|
|
|
|
|
|
|
|
Instantiate with: IMAP4([host[, port]])
|
|
|
|
|
|
|
|
host - host's name (default: localhost);
|
|
|
|
port - port number (default: standard IMAP4 port).
|
|
|
|
|
|
|
|
All IMAP4rev1 commands are supported by methods of the same
|
|
|
|
name (in lower-case).
|
|
|
|
|
|
|
|
All arguments to commands are converted to strings, except for
|
|
|
|
AUTHENTICATE, and the last argument to APPEND which is passed as
|
|
|
|
an IMAP4 literal. If necessary (the string contains any
|
|
|
|
non-printing characters or white-space and isn't enclosed with
|
|
|
|
either parentheses or double quotes) each string is quoted.
|
|
|
|
However, the 'password' argument to the LOGIN command is always
|
|
|
|
quoted. If you want to avoid having an argument string quoted
|
|
|
|
(eg: the 'flags' argument to STORE) then enclose the string in
|
|
|
|
parentheses (eg: "(\Deleted)").
|
1998-05-29 21:34:03 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
Each command returns a tuple: (type, [data, ...]) where 'type'
|
|
|
|
is usually 'OK' or 'NO', and 'data' is either the text from the
|
2002-11-22 13:53:04 +08:00
|
|
|
tagged response, or untagged results from command. Each 'data'
|
|
|
|
is either a string, or a tuple. If a tuple, then the first part
|
|
|
|
is the header of the response, and the second part contains
|
|
|
|
the data (ie: 'literal' value).
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
Errors raise the exception class <instance>.error("<reason>").
|
|
|
|
IMAP4 server errors raise <instance>.abort("<reason>"),
|
|
|
|
which is a sub-class of 'error'. Mailbox status changes
|
|
|
|
from READ-WRITE to READ-ONLY raise the exception class
|
|
|
|
<instance>.readonly("<reason>"), which is a sub-class of 'abort'.
|
1998-06-18 22:24:28 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
"error" exceptions imply a program error.
|
|
|
|
"abort" exceptions imply the connection should be reset, and
|
|
|
|
the command re-tried.
|
|
|
|
"readonly" exceptions imply the command should be re-tried.
|
1999-12-14 07:27:45 +08:00
|
|
|
|
2005-06-02 07:50:52 +08:00
|
|
|
Note: to use this module, you must read the RFCs pertaining to the
|
|
|
|
IMAP4 protocol, as the semantics of the arguments to each IMAP4
|
|
|
|
command are left to the invoker, not to mention the results. Also,
|
|
|
|
most IMAP servers implement a sub-set of the commands available here.
|
2001-01-15 07:47:14 +08:00
|
|
|
"""
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
class error(Exception): pass # Logical errors - debug required
|
|
|
|
class abort(error): pass # Service errors - close and retry
|
|
|
|
class readonly(abort): pass # Mailbox status changed to READ-ONLY
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2015-05-11 07:17:23 +08:00
|
|
|
def __init__(self, host='', port=IMAP4_PORT):
|
2001-01-15 07:47:14 +08:00
|
|
|
self.debug = Debug
|
|
|
|
self.state = 'LOGOUT'
|
|
|
|
self.literal = None # A literal argument to a command
|
|
|
|
self.tagged_commands = {} # Tagged commands awaiting response
|
|
|
|
self.untagged_responses = {} # {typ: [data, ...], ...}
|
|
|
|
self.continuation_response = '' # Last continuation response
|
2005-08-31 18:46:29 +08:00
|
|
|
self.is_readonly = False # READ-ONLY desired state
|
2001-01-15 07:47:14 +08:00
|
|
|
self.tagnum = 0
|
2010-11-13 02:49:16 +08:00
|
|
|
self._tls_established = False
|
2015-05-11 07:17:23 +08:00
|
|
|
self._mode_ascii()
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Open socket to server.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
self.open(host, port)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2011-01-06 07:01:37 +08:00
|
|
|
try:
|
|
|
|
self._connect()
|
|
|
|
except Exception:
|
|
|
|
try:
|
|
|
|
self.shutdown()
|
2012-12-19 05:10:48 +08:00
|
|
|
except OSError:
|
2011-01-06 07:01:37 +08:00
|
|
|
pass
|
|
|
|
raise
|
|
|
|
|
2015-05-11 07:17:23 +08:00
|
|
|
def _mode_ascii(self):
|
|
|
|
self.utf8_enabled = False
|
|
|
|
self._encoding = 'ascii'
|
|
|
|
self.Literal = re.compile(_Literal, re.ASCII)
|
|
|
|
self.Untagged_status = re.compile(_Untagged_status, re.ASCII)
|
|
|
|
|
|
|
|
|
|
|
|
def _mode_utf8(self):
|
|
|
|
self.utf8_enabled = True
|
|
|
|
self._encoding = 'utf-8'
|
|
|
|
self.Literal = re.compile(_Literal)
|
|
|
|
self.Untagged_status = re.compile(_Untagged_status)
|
|
|
|
|
2011-01-06 07:01:37 +08:00
|
|
|
|
|
|
|
def _connect(self):
|
2001-01-15 07:47:14 +08:00
|
|
|
# Create unique tag for this session,
|
|
|
|
# and compile tagged response matcher.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2005-07-05 12:20:07 +08:00
|
|
|
self.tagpre = Int2AP(random.randint(4096, 65535))
|
2008-11-06 03:39:50 +08:00
|
|
|
self.tagre = re.compile(br'(?P<tag>'
|
2001-01-15 07:47:14 +08:00
|
|
|
+ self.tagpre
|
2008-11-06 03:39:50 +08:00
|
|
|
+ br'\d+) (?P<type>[A-Z]+) (?P<data>.*)', re.ASCII)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Get server welcome message,
|
|
|
|
# request and store CAPABILITY response.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if __debug__:
|
2002-02-22 09:15:17 +08:00
|
|
|
self._cmd_log_len = 10
|
|
|
|
self._cmd_log_idx = 0
|
|
|
|
self._cmd_log = {} # Last `_cmd_log_len' interactions
|
2001-01-15 07:47:14 +08:00
|
|
|
if self.debug >= 1:
|
2002-02-22 09:15:17 +08:00
|
|
|
self._mesg('imaplib version %s' % __version__)
|
|
|
|
self._mesg('new IMAP4 connection, tag=%s' % self.tagpre)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
self.welcome = self._get_response()
|
2002-06-01 22:18:47 +08:00
|
|
|
if 'PREAUTH' in self.untagged_responses:
|
2001-01-15 07:47:14 +08:00
|
|
|
self.state = 'AUTH'
|
2002-06-01 22:18:47 +08:00
|
|
|
elif 'OK' in self.untagged_responses:
|
2001-01-15 07:47:14 +08:00
|
|
|
self.state = 'NONAUTH'
|
|
|
|
else:
|
|
|
|
raise self.error(self.welcome)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2010-11-17 01:55:26 +08:00
|
|
|
self._get_capabilities()
|
2001-01-15 07:47:14 +08:00
|
|
|
if __debug__:
|
|
|
|
if self.debug >= 3:
|
2004-02-13 01:35:32 +08:00
|
|
|
self._mesg('CAPABILITIES: %r' % (self.capabilities,))
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
for version in AllowedVersions:
|
|
|
|
if not version in self.capabilities:
|
|
|
|
continue
|
|
|
|
self.PROTOCOL_VERSION = version
|
|
|
|
return
|
1998-06-25 10:22:16 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
raise self.error('server not IMAP4 compliant')
|
1998-04-11 09:22:34 +08:00
|
|
|
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def __getattr__(self, attr):
|
|
|
|
# Allow UPPERCASE variants of IMAP4 command methods.
|
2002-06-01 22:18:47 +08:00
|
|
|
if attr in Commands:
|
2001-07-20 18:52:06 +08:00
|
|
|
return getattr(self, attr.lower())
|
2001-01-15 07:47:14 +08:00
|
|
|
raise AttributeError("Unknown IMAP4 command: '%s'" % attr)
|
|
|
|
|
2014-09-10 00:07:49 +08:00
|
|
|
def __enter__(self):
|
|
|
|
return self
|
|
|
|
|
|
|
|
def __exit__(self, *args):
|
|
|
|
try:
|
|
|
|
self.logout()
|
|
|
|
except OSError:
|
|
|
|
pass
|
1998-09-28 23:34:46 +08:00
|
|
|
|
|
|
|
|
2001-07-20 18:52:06 +08:00
|
|
|
# Overridable methods
|
1998-09-28 23:34:46 +08:00
|
|
|
|
|
|
|
|
2008-11-06 03:39:50 +08:00
|
|
|
def _create_socket(self):
|
2009-05-15 20:15:51 +08:00
|
|
|
return socket.create_connection((self.host, self.port))
|
2008-11-06 03:39:50 +08:00
|
|
|
|
2002-06-06 06:31:57 +08:00
|
|
|
def open(self, host = '', port = IMAP4_PORT):
|
|
|
|
"""Setup connection to remote server on "host:port"
|
|
|
|
(default: localhost:standard IMAP4 port).
|
2001-07-20 18:52:06 +08:00
|
|
|
This connection will be used by the routines:
|
|
|
|
read, readline, send, shutdown.
|
|
|
|
"""
|
2002-06-06 06:31:57 +08:00
|
|
|
self.host = host
|
|
|
|
self.port = port
|
2008-11-06 03:39:50 +08:00
|
|
|
self.sock = self._create_socket()
|
2001-10-15 21:47:08 +08:00
|
|
|
self.file = self.sock.makefile('rb')
|
1998-06-18 22:24:28 +08:00
|
|
|
|
|
|
|
|
2001-07-20 18:52:06 +08:00
|
|
|
def read(self, size):
|
|
|
|
"""Read 'size' bytes from remote."""
|
2011-05-25 05:47:49 +08:00
|
|
|
return self.file.read(size)
|
2001-07-20 18:52:06 +08:00
|
|
|
|
|
|
|
|
|
|
|
def readline(self):
|
|
|
|
"""Read line from remote."""
|
2013-10-27 13:52:14 +08:00
|
|
|
line = self.file.readline(_MAXLINE + 1)
|
|
|
|
if len(line) > _MAXLINE:
|
|
|
|
raise self.error("got more than %d bytes" % _MAXLINE)
|
|
|
|
return line
|
2001-07-20 18:52:06 +08:00
|
|
|
|
|
|
|
|
|
|
|
def send(self, data):
|
|
|
|
"""Send data to remote."""
|
2002-02-17 07:06:19 +08:00
|
|
|
self.sock.sendall(data)
|
2001-07-20 18:52:06 +08:00
|
|
|
|
2002-02-22 09:15:17 +08:00
|
|
|
|
2001-07-20 18:52:06 +08:00
|
|
|
def shutdown(self):
|
|
|
|
"""Close I/O established in "open"."""
|
|
|
|
self.file.close()
|
2010-11-10 16:59:25 +08:00
|
|
|
try:
|
|
|
|
self.sock.shutdown(socket.SHUT_RDWR)
|
2012-12-19 05:10:48 +08:00
|
|
|
except OSError as e:
|
2010-11-10 16:59:25 +08:00
|
|
|
# The server might already have closed the connection
|
|
|
|
if e.errno != errno.ENOTCONN:
|
|
|
|
raise
|
|
|
|
finally:
|
|
|
|
self.sock.close()
|
2001-07-20 18:52:06 +08:00
|
|
|
|
|
|
|
|
|
|
|
def socket(self):
|
|
|
|
"""Return socket instance used to connect to IMAP4 server.
|
|
|
|
|
|
|
|
socket = <instance>.socket()
|
|
|
|
"""
|
|
|
|
return self.sock
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Utility methods
|
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def recent(self):
|
|
|
|
"""Return most recent 'RECENT' responses if any exist,
|
|
|
|
else prompt server for an update using the 'NOOP' command.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.recent()
|
1998-09-28 23:34:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
'data' is None if no new messages,
|
|
|
|
else list of RECENT responses, most recent last.
|
|
|
|
"""
|
|
|
|
name = 'RECENT'
|
|
|
|
typ, dat = self._untagged_response('OK', [None], name)
|
|
|
|
if dat[-1]:
|
|
|
|
return typ, dat
|
|
|
|
typ, dat = self.noop() # Prod server for response
|
|
|
|
return self._untagged_response(typ, dat, name)
|
1998-09-28 23:34:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def response(self, code):
|
|
|
|
"""Return data for response 'code' if received, or None.
|
1998-09-28 23:34:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
Old value for response 'code' is cleared.
|
1998-09-28 23:34:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(code, [data]) = <instance>.response(code)
|
|
|
|
"""
|
2001-02-09 14:50:21 +08:00
|
|
|
return self._untagged_response(code, [None], code.upper())
|
1998-09-28 23:34:46 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# IMAP4 commands
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def append(self, mailbox, flags, date_time, message):
|
|
|
|
"""Append message to named mailbox.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.append(mailbox, flags, date_time, message)
|
1999-12-14 07:27:45 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
All args except `message' can be None.
|
|
|
|
"""
|
|
|
|
name = 'APPEND'
|
|
|
|
if not mailbox:
|
|
|
|
mailbox = 'INBOX'
|
|
|
|
if flags:
|
|
|
|
if (flags[0],flags[-1]) != ('(',')'):
|
|
|
|
flags = '(%s)' % flags
|
|
|
|
else:
|
|
|
|
flags = None
|
|
|
|
if date_time:
|
|
|
|
date_time = Time2Internaldate(date_time)
|
|
|
|
else:
|
|
|
|
date_time = None
|
2015-05-11 07:17:23 +08:00
|
|
|
literal = MapCRLF.sub(CRLF, message)
|
|
|
|
if self.utf8_enabled:
|
|
|
|
literal = b'UTF8 (' + literal + b')'
|
|
|
|
self.literal = literal
|
2001-01-15 07:47:14 +08:00
|
|
|
return self._simple_command(name, mailbox, flags, date_time)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def authenticate(self, mechanism, authobject):
|
|
|
|
"""Authenticate command - requires response processing.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
'mechanism' specifies which authentication mechanism is to
|
|
|
|
be used - it must appear in <instance>.capabilities in the
|
|
|
|
form AUTH=<mechanism>.
|
1998-06-18 22:24:28 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
'authobject' must be a callable object:
|
1998-06-18 22:24:28 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
data = authobject(response)
|
1998-06-18 22:24:28 +08:00
|
|
|
|
2013-02-20 01:17:31 +08:00
|
|
|
It will be called to process server continuation responses; the
|
|
|
|
response argument it is passed will be a bytes. It should return bytes
|
|
|
|
data that will be base64 encoded and sent to the server. It should
|
|
|
|
return None if the client abort response '*' should be sent instead.
|
2001-01-15 07:47:14 +08:00
|
|
|
"""
|
2001-02-09 14:50:21 +08:00
|
|
|
mech = mechanism.upper()
|
2003-06-29 12:21:43 +08:00
|
|
|
# XXX: shouldn't this code be removed, not commented out?
|
|
|
|
#cap = 'AUTH=%s' % mech
|
2002-11-24 10:35:35 +08:00
|
|
|
#if not cap in self.capabilities: # Let the server decide!
|
2002-11-22 13:53:04 +08:00
|
|
|
# raise self.error("Server doesn't allow %s authentication." % mech)
|
2001-01-15 07:47:14 +08:00
|
|
|
self.literal = _Authenticator(authobject).process
|
|
|
|
typ, dat = self._simple_command('AUTHENTICATE', mech)
|
|
|
|
if typ != 'OK':
|
|
|
|
raise self.error(dat[-1])
|
|
|
|
self.state = 'AUTH'
|
|
|
|
return typ, dat
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2005-06-02 07:50:52 +08:00
|
|
|
def capability(self):
|
|
|
|
"""(typ, [data]) = <instance>.capability()
|
|
|
|
Fetch capabilities list from server."""
|
|
|
|
|
|
|
|
name = 'CAPABILITY'
|
|
|
|
typ, dat = self._simple_command(name)
|
|
|
|
return self._untagged_response(typ, dat, name)
|
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def check(self):
|
|
|
|
"""Checkpoint mailbox on server.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.check()
|
|
|
|
"""
|
|
|
|
return self._simple_command('CHECK')
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def close(self):
|
|
|
|
"""Close currently selected mailbox.
|
1998-04-09 22:20:31 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
Deleted messages are removed from writable mailbox.
|
|
|
|
This is the recommended command before 'LOGOUT'.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.close()
|
|
|
|
"""
|
|
|
|
try:
|
|
|
|
typ, dat = self._simple_command('CLOSE')
|
|
|
|
finally:
|
|
|
|
self.state = 'AUTH'
|
|
|
|
return typ, dat
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def copy(self, message_set, new_mailbox):
|
|
|
|
"""Copy 'message_set' messages onto end of 'new_mailbox'.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.copy(message_set, new_mailbox)
|
|
|
|
"""
|
|
|
|
return self._simple_command('COPY', message_set, new_mailbox)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def create(self, mailbox):
|
|
|
|
"""Create new mailbox.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.create(mailbox)
|
|
|
|
"""
|
|
|
|
return self._simple_command('CREATE', mailbox)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def delete(self, mailbox):
|
|
|
|
"""Delete old mailbox.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.delete(mailbox)
|
|
|
|
"""
|
|
|
|
return self._simple_command('DELETE', mailbox)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2004-07-27 13:07:19 +08:00
|
|
|
def deleteacl(self, mailbox, who):
|
|
|
|
"""Delete the ACLs (remove any rights) set for who on mailbox.
|
|
|
|
|
|
|
|
(typ, [data]) = <instance>.deleteacl(mailbox, who)
|
|
|
|
"""
|
|
|
|
return self._simple_command('DELETEACL', mailbox, who)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2015-05-11 07:17:23 +08:00
|
|
|
def enable(self, capability):
|
|
|
|
"""Send an RFC5161 enable string to the server.
|
|
|
|
|
|
|
|
(typ, [data]) = <intance>.enable(capability)
|
|
|
|
"""
|
|
|
|
if 'ENABLE' not in self.capabilities:
|
|
|
|
raise IMAP4.error("Server does not support ENABLE")
|
|
|
|
typ, data = self._simple_command('ENABLE', capability)
|
|
|
|
if typ == 'OK' and 'UTF8=ACCEPT' in capability.upper():
|
|
|
|
self._mode_utf8()
|
|
|
|
return typ, data
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def expunge(self):
|
|
|
|
"""Permanently remove deleted items from selected mailbox.
|
1998-04-09 22:20:31 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
Generates 'EXPUNGE' response for each deleted message.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.expunge()
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
'data' is list of 'EXPUNGE'd message numbers in order received.
|
|
|
|
"""
|
|
|
|
name = 'EXPUNGE'
|
|
|
|
typ, dat = self._simple_command(name)
|
|
|
|
return self._untagged_response(typ, dat, name)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def fetch(self, message_set, message_parts):
|
|
|
|
"""Fetch (parts of) messages.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data, ...]) = <instance>.fetch(message_set, message_parts)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
'message_parts' should be a string of selected parts
|
|
|
|
enclosed in parentheses, eg: "(UID BODY[TEXT])".
|
2000-05-25 11:25:26 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
'data' are tuples of message part envelope and data.
|
|
|
|
"""
|
|
|
|
name = 'FETCH'
|
|
|
|
typ, dat = self._simple_command(name, message_set, message_parts)
|
|
|
|
return self._untagged_response(typ, dat, name)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-07-20 18:52:06 +08:00
|
|
|
def getacl(self, mailbox):
|
|
|
|
"""Get the ACLs for a mailbox.
|
|
|
|
|
|
|
|
(typ, [data]) = <instance>.getacl(mailbox)
|
|
|
|
"""
|
|
|
|
typ, dat = self._simple_command('GETACL', mailbox)
|
|
|
|
return self._untagged_response(typ, dat, 'ACL')
|
|
|
|
|
|
|
|
|
2005-06-02 07:50:52 +08:00
|
|
|
def getannotation(self, mailbox, entry, attribute):
|
|
|
|
"""(typ, [data]) = <instance>.getannotation(mailbox, entry, attribute)
|
|
|
|
Retrieve ANNOTATIONs."""
|
|
|
|
|
|
|
|
typ, dat = self._simple_command('GETANNOTATION', mailbox, entry, attribute)
|
|
|
|
return self._untagged_response(typ, dat, 'ANNOTATION')
|
|
|
|
|
|
|
|
|
2002-06-17 15:07:20 +08:00
|
|
|
def getquota(self, root):
|
|
|
|
"""Get the quota root's resource usage and limits.
|
|
|
|
|
2002-06-17 20:43:20 +08:00
|
|
|
Part of the IMAP4 QUOTA extension defined in rfc2087.
|
2002-06-17 15:07:20 +08:00
|
|
|
|
|
|
|
(typ, [data]) = <instance>.getquota(root)
|
2002-06-17 20:43:20 +08:00
|
|
|
"""
|
2002-06-17 15:07:20 +08:00
|
|
|
typ, dat = self._simple_command('GETQUOTA', root)
|
|
|
|
return self._untagged_response(typ, dat, 'QUOTA')
|
|
|
|
|
|
|
|
|
|
|
|
def getquotaroot(self, mailbox):
|
|
|
|
"""Get the list of quota roots for the named mailbox.
|
|
|
|
|
|
|
|
(typ, [[QUOTAROOT responses...], [QUOTA responses]]) = <instance>.getquotaroot(mailbox)
|
2002-06-17 20:43:20 +08:00
|
|
|
"""
|
2004-08-10 09:24:54 +08:00
|
|
|
typ, dat = self._simple_command('GETQUOTAROOT', mailbox)
|
2002-06-17 15:07:20 +08:00
|
|
|
typ, quota = self._untagged_response(typ, dat, 'QUOTA')
|
|
|
|
typ, quotaroot = self._untagged_response(typ, dat, 'QUOTAROOT')
|
2002-06-17 20:43:20 +08:00
|
|
|
return typ, [quotaroot, quota]
|
2002-06-17 15:07:20 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def list(self, directory='""', pattern='*'):
|
|
|
|
"""List mailbox names in directory matching pattern.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.list(directory='""', pattern='*')
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
'data' is list of LIST responses.
|
|
|
|
"""
|
|
|
|
name = 'LIST'
|
|
|
|
typ, dat = self._simple_command(name, directory, pattern)
|
|
|
|
return self._untagged_response(typ, dat, name)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def login(self, user, password):
|
|
|
|
"""Identify client using plaintext password.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.login(user, password)
|
1999-12-14 07:27:45 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
NB: 'password' will be quoted.
|
|
|
|
"""
|
|
|
|
typ, dat = self._simple_command('LOGIN', user, self._quote(password))
|
|
|
|
if typ != 'OK':
|
|
|
|
raise self.error(dat[-1])
|
|
|
|
self.state = 'AUTH'
|
|
|
|
return typ, dat
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2002-11-22 13:53:04 +08:00
|
|
|
def login_cram_md5(self, user, password):
|
|
|
|
""" Force use of CRAM-MD5 authentication.
|
|
|
|
|
|
|
|
(typ, [data]) = <instance>.login_cram_md5(user, password)
|
|
|
|
"""
|
|
|
|
self.user, self.password = user, password
|
|
|
|
return self.authenticate('CRAM-MD5', self._CRAM_MD5_AUTH)
|
|
|
|
|
|
|
|
|
|
|
|
def _CRAM_MD5_AUTH(self, challenge):
|
|
|
|
""" Authobject to use with CRAM-MD5 authentication. """
|
|
|
|
import hmac
|
2015-05-11 07:17:23 +08:00
|
|
|
pwd = (self.password.encode('utf-8') if isinstance(self.password, str)
|
2013-02-20 01:17:31 +08:00
|
|
|
else self.password)
|
2013-11-21 00:23:06 +08:00
|
|
|
return self.user + " " + hmac.HMAC(pwd, challenge, 'md5').hexdigest()
|
2002-11-22 13:53:04 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def logout(self):
|
|
|
|
"""Shutdown connection to server.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.logout()
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
Returns server 'BYE' response.
|
|
|
|
"""
|
|
|
|
self.state = 'LOGOUT'
|
|
|
|
try: typ, dat = self._simple_command('LOGOUT')
|
|
|
|
except: typ, dat = 'NO', ['%s: %s' % sys.exc_info()[:2]]
|
2001-07-20 18:52:06 +08:00
|
|
|
self.shutdown()
|
2002-06-01 22:18:47 +08:00
|
|
|
if 'BYE' in self.untagged_responses:
|
2001-01-15 07:47:14 +08:00
|
|
|
return 'BYE', self.untagged_responses['BYE']
|
|
|
|
return typ, dat
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def lsub(self, directory='""', pattern='*'):
|
|
|
|
"""List 'subscribed' mailbox names in directory matching pattern.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data, ...]) = <instance>.lsub(directory='""', pattern='*')
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
'data' are tuples of message part envelope and data.
|
|
|
|
"""
|
|
|
|
name = 'LSUB'
|
|
|
|
typ, dat = self._simple_command(name, directory, pattern)
|
|
|
|
return self._untagged_response(typ, dat, name)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2004-07-27 13:07:19 +08:00
|
|
|
def myrights(self, mailbox):
|
|
|
|
"""Show my ACLs for a mailbox (i.e. the rights that I have on mailbox).
|
|
|
|
|
|
|
|
(typ, [data]) = <instance>.myrights(mailbox)
|
|
|
|
"""
|
|
|
|
typ,dat = self._simple_command('MYRIGHTS', mailbox)
|
|
|
|
return self._untagged_response(typ, dat, 'MYRIGHTS')
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-07-20 18:52:06 +08:00
|
|
|
def namespace(self):
|
|
|
|
""" Returns IMAP namespaces ala rfc2342
|
|
|
|
|
|
|
|
(typ, [data, ...]) = <instance>.namespace()
|
|
|
|
"""
|
|
|
|
name = 'NAMESPACE'
|
|
|
|
typ, dat = self._simple_command(name)
|
|
|
|
return self._untagged_response(typ, dat, name)
|
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def noop(self):
|
|
|
|
"""Send NOOP command.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2002-11-22 13:53:04 +08:00
|
|
|
(typ, [data]) = <instance>.noop()
|
2001-01-15 07:47:14 +08:00
|
|
|
"""
|
|
|
|
if __debug__:
|
|
|
|
if self.debug >= 3:
|
2002-02-22 09:15:17 +08:00
|
|
|
self._dump_ur(self.untagged_responses)
|
2001-01-15 07:47:14 +08:00
|
|
|
return self._simple_command('NOOP')
|
1998-05-29 21:34:03 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def partial(self, message_num, message_part, start, length):
|
|
|
|
"""Fetch truncated part of a message.
|
1998-06-18 22:24:28 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data, ...]) = <instance>.partial(message_num, message_part, start, length)
|
1998-06-18 22:24:28 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
'data' is tuple of message part envelope and data.
|
|
|
|
"""
|
|
|
|
name = 'PARTIAL'
|
|
|
|
typ, dat = self._simple_command(name, message_num, message_part, start, length)
|
|
|
|
return self._untagged_response(typ, dat, 'FETCH')
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2002-11-22 13:53:04 +08:00
|
|
|
def proxyauth(self, user):
|
|
|
|
"""Assume authentication as "user".
|
|
|
|
|
|
|
|
Allows an authorised administrator to proxy into any user's
|
|
|
|
mailbox.
|
|
|
|
|
|
|
|
(typ, [data]) = <instance>.proxyauth(user)
|
|
|
|
"""
|
|
|
|
|
|
|
|
name = 'PROXYAUTH'
|
|
|
|
return self._simple_command('PROXYAUTH', user)
|
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def rename(self, oldmailbox, newmailbox):
|
|
|
|
"""Rename old mailbox name to new.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2002-11-22 13:53:04 +08:00
|
|
|
(typ, [data]) = <instance>.rename(oldmailbox, newmailbox)
|
2001-01-15 07:47:14 +08:00
|
|
|
"""
|
|
|
|
return self._simple_command('RENAME', oldmailbox, newmailbox)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def search(self, charset, *criteria):
|
|
|
|
"""Search mailbox for matching messages.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2003-03-28 00:59:38 +08:00
|
|
|
(typ, [data]) = <instance>.search(charset, criterion, ...)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
'data' is space separated list of matching message numbers.
|
2015-05-11 07:17:23 +08:00
|
|
|
If UTF8 is enabled, charset MUST be None.
|
2001-01-15 07:47:14 +08:00
|
|
|
"""
|
|
|
|
name = 'SEARCH'
|
|
|
|
if charset:
|
2015-05-11 07:17:23 +08:00
|
|
|
if self.utf8_enabled:
|
|
|
|
raise IMAP4.error("Non-None charset not valid in UTF8 mode")
|
2003-02-28 04:14:51 +08:00
|
|
|
typ, dat = self._simple_command(name, 'CHARSET', charset, *criteria)
|
2001-07-20 18:52:06 +08:00
|
|
|
else:
|
2003-02-28 04:14:51 +08:00
|
|
|
typ, dat = self._simple_command(name, *criteria)
|
2001-01-15 07:47:14 +08:00
|
|
|
return self._untagged_response(typ, dat, name)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2005-08-31 18:46:29 +08:00
|
|
|
def select(self, mailbox='INBOX', readonly=False):
|
2001-01-15 07:47:14 +08:00
|
|
|
"""Select a mailbox.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
Flush all untagged responses.
|
1998-05-18 22:39:42 +08:00
|
|
|
|
2005-08-31 18:46:29 +08:00
|
|
|
(typ, [data]) = <instance>.select(mailbox='INBOX', readonly=False)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
'data' is count of messages in mailbox ('EXISTS' response).
|
2004-08-10 09:24:54 +08:00
|
|
|
|
|
|
|
Mandated responses are ('FLAGS', 'EXISTS', 'RECENT', 'UIDVALIDITY'), so
|
|
|
|
other responses should be obtained via <instance>.response('FLAGS') etc.
|
2001-01-15 07:47:14 +08:00
|
|
|
"""
|
|
|
|
self.untagged_responses = {} # Flush old responses.
|
|
|
|
self.is_readonly = readonly
|
2005-08-31 18:46:29 +08:00
|
|
|
if readonly:
|
2001-01-15 07:47:14 +08:00
|
|
|
name = 'EXAMINE'
|
|
|
|
else:
|
|
|
|
name = 'SELECT'
|
|
|
|
typ, dat = self._simple_command(name, mailbox)
|
|
|
|
if typ != 'OK':
|
|
|
|
self.state = 'AUTH' # Might have been 'SELECTED'
|
|
|
|
return typ, dat
|
|
|
|
self.state = 'SELECTED'
|
2002-06-01 22:18:47 +08:00
|
|
|
if 'READ-ONLY' in self.untagged_responses \
|
2001-01-15 07:47:14 +08:00
|
|
|
and not readonly:
|
|
|
|
if __debug__:
|
|
|
|
if self.debug >= 1:
|
2002-02-22 09:15:17 +08:00
|
|
|
self._dump_ur(self.untagged_responses)
|
2001-01-15 07:47:14 +08:00
|
|
|
raise self.readonly('%s is not writable' % mailbox)
|
|
|
|
return typ, self.untagged_responses.get('EXISTS', [None])
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-07-20 18:52:06 +08:00
|
|
|
def setacl(self, mailbox, who, what):
|
|
|
|
"""Set a mailbox acl.
|
|
|
|
|
2004-03-25 08:12:21 +08:00
|
|
|
(typ, [data]) = <instance>.setacl(mailbox, who, what)
|
2001-07-20 18:52:06 +08:00
|
|
|
"""
|
|
|
|
return self._simple_command('SETACL', mailbox, who, what)
|
|
|
|
|
|
|
|
|
2005-06-02 07:50:52 +08:00
|
|
|
def setannotation(self, *args):
|
|
|
|
"""(typ, [data]) = <instance>.setannotation(mailbox[, entry, attribute]+)
|
|
|
|
Set ANNOTATIONs."""
|
|
|
|
|
|
|
|
typ, dat = self._simple_command('SETANNOTATION', *args)
|
|
|
|
return self._untagged_response(typ, dat, 'ANNOTATION')
|
|
|
|
|
|
|
|
|
2002-06-17 15:07:20 +08:00
|
|
|
def setquota(self, root, limits):
|
|
|
|
"""Set the quota root's resource limits.
|
|
|
|
|
|
|
|
(typ, [data]) = <instance>.setquota(root, limits)
|
2002-06-17 20:43:20 +08:00
|
|
|
"""
|
2002-06-17 15:07:20 +08:00
|
|
|
typ, dat = self._simple_command('SETQUOTA', root, limits)
|
|
|
|
return self._untagged_response(typ, dat, 'QUOTA')
|
|
|
|
|
|
|
|
|
2001-07-20 18:52:06 +08:00
|
|
|
def sort(self, sort_criteria, charset, *search_criteria):
|
|
|
|
"""IMAP4rev1 extension SORT command.
|
|
|
|
|
|
|
|
(typ, [data]) = <instance>.sort(sort_criteria, charset, search_criteria, ...)
|
|
|
|
"""
|
|
|
|
name = 'SORT'
|
2001-07-21 09:41:30 +08:00
|
|
|
#if not name in self.capabilities: # Let the server decide!
|
|
|
|
# raise self.error('unimplemented extension command: %s' % name)
|
2001-07-20 18:52:06 +08:00
|
|
|
if (sort_criteria[0],sort_criteria[-1]) != ('(',')'):
|
2001-07-21 09:41:30 +08:00
|
|
|
sort_criteria = '(%s)' % sort_criteria
|
2003-02-28 04:14:51 +08:00
|
|
|
typ, dat = self._simple_command(name, sort_criteria, charset, *search_criteria)
|
2001-07-20 18:52:06 +08:00
|
|
|
return self._untagged_response(typ, dat, name)
|
|
|
|
|
|
|
|
|
2010-11-13 02:49:16 +08:00
|
|
|
def starttls(self, ssl_context=None):
|
|
|
|
name = 'STARTTLS'
|
|
|
|
if not HAVE_SSL:
|
|
|
|
raise self.error('SSL support missing')
|
|
|
|
if self._tls_established:
|
|
|
|
raise self.abort('TLS session already established')
|
|
|
|
if name not in self.capabilities:
|
|
|
|
raise self.abort('TLS not supported by server')
|
|
|
|
# Generate a default SSL context if none was passed.
|
|
|
|
if ssl_context is None:
|
2013-11-24 05:43:47 +08:00
|
|
|
ssl_context = ssl._create_stdlib_context()
|
2010-11-13 02:49:16 +08:00
|
|
|
typ, dat = self._simple_command(name)
|
|
|
|
if typ == 'OK':
|
2013-12-03 03:01:29 +08:00
|
|
|
self.sock = ssl_context.wrap_socket(self.sock,
|
2014-11-24 07:04:34 +08:00
|
|
|
server_hostname=self.host)
|
2010-11-13 02:49:16 +08:00
|
|
|
self.file = self.sock.makefile('rb')
|
|
|
|
self._tls_established = True
|
2010-11-17 01:55:26 +08:00
|
|
|
self._get_capabilities()
|
2010-11-13 02:49:16 +08:00
|
|
|
else:
|
|
|
|
raise self.error("Couldn't establish TLS session")
|
|
|
|
return self._untagged_response(typ, dat, name)
|
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def status(self, mailbox, names):
|
|
|
|
"""Request named status conditions for mailbox.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.status(mailbox, names)
|
|
|
|
"""
|
|
|
|
name = 'STATUS'
|
2001-07-21 09:41:30 +08:00
|
|
|
#if self.PROTOCOL_VERSION == 'IMAP4': # Let the server decide!
|
2001-07-20 18:52:06 +08:00
|
|
|
# raise self.error('%s unimplemented in IMAP4 (obtain IMAP4rev1 server, or re-code)' % name)
|
2001-01-15 07:47:14 +08:00
|
|
|
typ, dat = self._simple_command(name, mailbox, names)
|
|
|
|
return self._untagged_response(typ, dat, name)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def store(self, message_set, command, flags):
|
|
|
|
"""Alters flag dispositions for messages in mailbox.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.store(message_set, command, flags)
|
|
|
|
"""
|
|
|
|
if (flags[0],flags[-1]) != ('(',')'):
|
|
|
|
flags = '(%s)' % flags # Avoid quoting the flags
|
|
|
|
typ, dat = self._simple_command('STORE', message_set, command, flags)
|
|
|
|
return self._untagged_response(typ, dat, 'FETCH')
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def subscribe(self, mailbox):
|
|
|
|
"""Subscribe to new mailbox.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.subscribe(mailbox)
|
|
|
|
"""
|
|
|
|
return self._simple_command('SUBSCRIBE', mailbox)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2003-11-10 14:44:44 +08:00
|
|
|
def thread(self, threading_algorithm, charset, *search_criteria):
|
|
|
|
"""IMAPrev1 extension THREAD command.
|
|
|
|
|
2009-12-25 00:12:49 +08:00
|
|
|
(type, [data]) = <instance>.thread(threading_algorithm, charset, search_criteria, ...)
|
2003-11-10 14:44:44 +08:00
|
|
|
"""
|
|
|
|
name = 'THREAD'
|
|
|
|
typ, dat = self._simple_command(name, threading_algorithm, charset, *search_criteria)
|
|
|
|
return self._untagged_response(typ, dat, name)
|
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def uid(self, command, *args):
|
|
|
|
"""Execute "command arg ..." with messages identified by UID,
|
|
|
|
rather than message number.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.uid(command, arg1, arg2, ...)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
Returns response appropriate to 'command'.
|
|
|
|
"""
|
2001-02-09 14:50:21 +08:00
|
|
|
command = command.upper()
|
2002-06-01 22:18:47 +08:00
|
|
|
if not command in Commands:
|
2001-01-15 07:47:14 +08:00
|
|
|
raise self.error("Unknown IMAP4 UID command: %s" % command)
|
|
|
|
if self.state not in Commands[command]:
|
Merged revisions 53952-54987 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines
Do not copy free variables to locals in class namespaces.
Fixes bug 1569356, but at the cost of a minor incompatibility in
locals(). Add test that verifies that the class namespace is not
polluted. Also clarify the behavior in the library docs.
Along the way, cleaned up the dict_to_map and map_to_dict
implementations and added some comments that explain what they do.
........
r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines
Fix assertion.
........
r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines
When printing an unraisable error, don't print exceptions. before the name.
This duplicates the behavior whening normally printing exceptions.
........
r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line
Markup fix
........
r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines
SF #1669182, 2.5 was already fixed. Just assert in 2.6 since string exceptions
are gone.
........
r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line
Add some items
........
r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines
Fix long-standing bug in name mangling for package imports
Reported by Mike Verdone.
........
r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines
tabify
........
r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines
tabify
Note that ast.c still has a mix of tabs and spaces, because it
attempts to use four-space indents for more of the new code.
........
r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines
whitespace normalization
........
r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines
Add checking for a number of metaclass error conditions.
We add some new rules that are required for preserving internal
invariants of types.
1. If type (or a subclass of type) appears in bases, it must appear
before any non-type bases. If a non-type base (like a regular
new-style class) occurred first, it could trick type into
allocating the new class an __dict__ which must be impossible.
2. There are several checks that are made of bases when creating a
type. Those checks are now repeated when assigning to __bases__.
We also add the restriction that assignment to __bases__ may not
change the metaclass of the type.
Add new tests for these cases and for a few other oddball errors that
were no previously tested. Remove a crasher test that was fixed.
Also some internal refactoring: Extract the code to find the most
derived metaclass of a type and its bases. It is now needed in two
places. Rewrite the TypeError checks in test_descr to use doctest.
The tests now clearly show what exception they expect to see.
........
r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines
Add news about changes to metaclasses and __bases__ error checking.
........
r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines
Modify the segfaulting example to show why r53997 is not a solution to
it.
........
r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines
Add a test for instantiating SyntaxError with no arguments.
........
r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line
Docstring nit.
........
r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line
Prepare collections module for pure python code entries.
........
r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line
Add collections.NamedTuple
........
r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line
Add Pat and Eric for work on PEP 3101 in the sandbox
........
r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line
Add NamedTuple
........
r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines
Bug #1628895: some better tries to find HTML documentation in pydoc.
........
r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line
Fix embarrassing typo and fix constantification of None
........
r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines
Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize.
........
r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines
Fix a bug in test_dict and test_userdict, found at the PyPy sprint.
........
r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines
Teach setup.py how to find Berkeley DB on Macs using MacPorts.
........
r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line
note MacPorts/BerkDB change in setup.py
........
r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line
Added Pete for 3101 too
........
r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line
Minor corrections to docs, and an explanation comentary
........
r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines
Patch #1674228: when assigning a slice (old-style), check for the
sq_ass_slice instead of the sq_slice slot.
........
r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines
Nit: a struct field is set to GenericAlloc, not GenericAlloc().
........
r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1671450: add a section about subclassing builtin types to the
"extending and embedding" tutorial.
........
r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1121142: Implement ZipFile.open.
........
r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines
A test case for the fix in #1674228.
........
r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1672481: fix bug in idlelib.MultiCall.
........
r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line
Bug #1674503: close the file opened by execfile() in an error condition.
........
r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines
Fix another reincarnation of bug #1576657 in defaultdict.
........
r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines
A test case for the defaultdict KeyError bug.
........
r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1663234: you can now run doctest on test files and modules
using "python -m doctest [-v] filename ...".
........
r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #912410: Replace HTML entity references for attribute values
in HTMLParser.
........
r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line
patch 1673619 - identify extension modules which cannot be built
........
r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines
Patch #1646728: datetime.fromtimestamp fails with negative
fractional times. With unittest.
Somebody please backport to 2.5.
........
r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines
Fix cmp vs. key argument for list.sort.
........
r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines
Small nit, found by Neal.
........
r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1602128: clarify that richcmp methods can return NotImplemented
and should return True or False otherwise.
........
r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1638879: don't accept strings with embedded NUL bytes in long().
........
r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1673121: update README wrt. OSX default shell.
........
r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1654417: make operator.{get,set,del}slice use the full range
of Py_ssize_t.
........
r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines
Patch for bug #1633621: if curses.resizeterm() or
curses.resize_term() is called, update _curses.LINES,
_curses.COLS, curses.LINES and curses.COLS.
........
r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Document change to curses.
........
r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines
Variant of patch #697613: don't exit the interpreter on a SystemExit
exception if the -i command line option or PYTHONINSPECT environment
variable is given, but break into the interactive interpreter just like
on other exceptions or normal program exit.
(backport)
........
r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines
Patch #703779: unset __file__ in __main__ after running a file. This
makes the filenames the warning module prints much more sensible when
a PYTHONSTARTUP file is used.
........
r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines
add versionadded info
........
r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler.
........
r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines
Patch #1001604: glob.glob() now returns unicode filenames if it was
given a unicode argument and os.listdir() returns unicode filenames.
........
r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines
Patches #1550273, #1550272: fix a few bugs in unittest and add a
comprehensive test suite for the module.
........
r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines
Patch #787789: allow to pass custom TestRunner instances to unittest's
main() function.
........
r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines
Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position.
........
r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines
Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', '').
........
r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines
Patch #1675471: convert test_pty to unittest.
........
r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines
Add some sanity checks to unittest.TestSuite's addTest(s) methods.
Fixes #878275.
........
r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines
Windows doesn't support negative timestamps. Skip the tests involving them
if os.name == "nt".
........
r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines
Add missing ) in parenthical remark.
........
r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines
Fix #1676656: \em is different from \emph...
........
r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines
Add a NEWS entry for rev. 54207,8.
........
r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line
SF 1676321: empty() returned wrong result
........
r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line
Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order.
........
r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line
SF #1637850: make_table in difflib did not work with unicode
........
r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line
Patch #1668482: don't use '-' in mkstemp
........
r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines
Introduce test.test_support.TransientResource. It's a context manager to
surround calls to resources that may or may not be available. Specifying the
expected exception and attributes to be raised if the resource is not available
prevents overly broad catching of exceptions.
This is meant to help suppress spurious failures by raising
test.test_support.ResourceDenied if the exception matches. It would probably
be good to go through the various network tests and surround the calls to catch
connection timeouts (as done with test_socket_ssl in this commit).
........
r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line
Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py
........
r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line
Add NEWS item for patch #1481079 (r54234).
........
r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line
Fix SF #1676971, Complex OverflowError has a typo
........
r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines
Typo.
........
r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines
Patch #957003: Implement smtplib.LMTP.
........
r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines
Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822.
........
r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines
Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0)
returned string up to the first NUL character.
........
r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines
Add Ziga Seilnacht.
........
r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines
Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError.
........
r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines
Bug #1651235: When a tuple was passed to a ctypes function call,
Python would crash instead of raising an error.
The crash was caused by a section of code that should have been
removed long ago, at that time ctypes had other ways to pass
parameters to function calls.
........
r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line
Hashing simplification pointed out by Thomas Wouters.
........
r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines
* Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink.
* Drop safe_remove() in favor of test_support.unlink().
* Fix the indentation of test_samefile so that it runs.
........
r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines
Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket.
Will backport.
........
r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines
Simplify a little by handling the TCP case first.
Update to use predominant style of spaces around = in args list
and print to stderr if debugging.
........
r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line
Add proper attribution for a bug fix.
........
r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines
Typos.
........
r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line
Convert an assert to a raise so it works even in the presence of -O.
........
r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines
Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer.
........
r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines
Add missing "return" statements in exception handler.
........
r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines
Patch #1675981: remove unreachable code from type.__new__() method.
__dict__ and __weakref__ are removed from the slots tuple earlier
in the code, in the loop that mangles slot names. Will backport.
........
r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines
Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number.
Will backport.
........
r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line
Fix resource leak reported in SF #1516995.
........
r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines
Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more
stable FTP.
Will backport.
........
r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines
Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the
display name of an email address, e.g.
Foo
\tBar <foo@example.com>
Test case added by Barry.
........
r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines
Sane humans would call these invalid tests, but Andrew McNamara pointed out
that given the inputs in these tests Excel does indeed produce the output
these tests expect. Document that for future confused folks.
........
r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines
Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86.
........
r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines
Patch #1677862: Require a space or tab after import in .pth files.
........
r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines
Backport from Py3k branch:
Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir.
Had to change a few bits of the patch because classobjs and __methods__ are still
in Py2.6.
........
r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines
Bug #1678647: write a newline after printing an exception in any
case, even when converting the value to a string failed.
........
r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line
Patch #1678088: convert test_operations to use unittest, fold the result into test_dict.
........
r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines
Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167.
Will backport.
........
r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines
Typo fix.
........
r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line
Patch #1670993: Refactor test_threadedtempfile.py to use unittest.
........
r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines
Whitespace normalization.
........
r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines
Set missing svn:eol-style property on text files.
........
r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines
Add test.test_support.transient_internet . Returns a context manager that
nests test.test_support.TransientResource context managers that capture
exceptions raised when the Internet connection is flaky.
Initially using in test_socket_ssl but should probably be expanded to cover any
test that should not raise the captured exceptions if the Internet connection
works.
........
r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines
Fix a typo where the variable name was not updated.
........
r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line
Add Jerry Seutter for a bunch of his recent patches refactoring tests
........
r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines
Add some other acks for recent checkins:
Brian Leair - 922167
Tomer Filiba - 1591665
Jeremy Jones - 1192590
........
r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines
Fix some style nits:
* lines too long
* wrong indentation
* space after a function name
* wrong function name in error string
* simplifying some logic
Also add an error check to PyDict_SetItemString.
........
r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines
Typo and grammar fixes.
........
r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1679379: add documentation for fnmatch.translate().
........
r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1642844: comments to clarify the complexobject constructor.
........
r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1668100: urllib2 now correctly raises URLError instead of
OSError if accessing a local file via the file:// protocol fails.
........
r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1635454: the csv.DictWriter class now includes the offending
field names in its exception message if you try to write a record with
a dictionary containing fields not in the CSV field names list.
........
r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1555098: use str.join() instead of repeated string
concatenation in robotparser.
........
r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to
pydoc's help keywords.
........
r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1569798: fix a bug in distutils when building Python from a
directory within sys.exec_prefix.
........
r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1449244: Support Unicode strings in
email.message.Message.{set_charset,get_content_charset}.
Will backport.
........
r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines
This is the implementation of POSIX.1-2001 (pax) format read/write
support.
The TarInfo class now contains all necessary logic to process and
create tar header data which has been moved there from the TarFile
class. The fromtarfile() method was added. The new path and linkpath
properties are aliases for the name and linkname attributes in
correspondence to the pax naming scheme.
The TarFile constructor and classmethods now accept a number of
keyword arguments which could only be set as attributes before (e.g.
dereference, ignore_zeros). The encoding and pax_headers arguments
were added for pax support. There is a new tarinfo keyword argument
that allows using subclassed TarInfo objects in TarFile.
The boolean TarFile.posix attribute is deprecated, because now three
tar formats are supported. Instead, the desired format for writing is
specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT
as the format keyword argument. This change affects TarInfo.tobuf()
as well.
The test suite has been heavily reorganized and partially rewritten.
A new testtar.tar was added that contains sample data in many formats
from 4 different tar programs.
Some bugs and quirks that also have been fixed:
Directory names do no longer have a trailing slash in TarInfo.name or
TarFile.getnames().
Adding the same file twice does not create a hardlink file member.
The TarFile constructor does no longer need a name argument.
The TarFile._mode attribute was renamed to mode and contains either
'r', 'w' or 'a'.
........
r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines
Bug #1622896: fix a rare corner case where the bz2 module raised an
error in spite of a succesful compression.
........
r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines
Quick fix for tests that fail on systems with an encoding other
than 'iso8859-1'.
........
r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1603688: ConfigParser.SafeConfigParser now checks values that
are set for invalid interpolation sequences that would lead to errors
on reading back those values.
........
r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1581073: add a flag to textwrap that prevents the dropping of
whitespace while wrapping.
........
r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1605192: list allowed states in error messages for imaplib.
........
r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter
which can be set to False to prevent the default delete-on-close
behavior.
........
r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines
Add acks for recent patch checkins:
Arvin Schnell - 1668482
S?\195?\169bastien Martini - 1481079
Heiko Wundram - 1491866
Damon Kohler - 1545011
Peter Parente - 1599845
Bjorn Lindqvist - 1678662
........
r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines
Acks for recent patches.
........
r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines
Fix a tab.
........
r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1533909: the timeit module now accepts callables in addition to
strings for the code to time and the setup code. Also added two
convenience functions for instantiating a Timer and calling its methods.
........
r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1530482: add pydoc.render_doc() which returns the documentation
for a thing instead of paging it to stdout, which pydoc.doc() does.
........
r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line
Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl.
........
r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1444529: the builtin compile() now accepts keyword arguments.
(backport)
........
r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line
Add versionadded marker for ctypes.c_bool.
........
r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1393667: pdb now has a "run" command which restarts the debugged
Python program, optionally with different arguments.
........
r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines
Deprecate commands.getstatus().
........
r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines
NEWS entry for getstatus() deprecation.
........
r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1429539: pdb now correctly initializes the __main__ module for
the debugged script, which means that imports from __main__ work
correctly now.
........
r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #957650: "%var%" environment variable references are now properly
expanded in ntpath.expandvars(), also "~user" home directory references
are recognized and handled on Windows.
........
r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1194449: correctly detect unbound methods in pydoc.
........
r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines
Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters
with ASCII value less than 32. Also, it correctly quotes dots only if
they occur on a single line, as opposed to the previous behavior of
quoting dots if they are the second character of any line.
........
r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line
Inline PyImport_GetModulesReloading().
........
r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines
SF bug #1582282; decode_header() incorrectly splits not-conformant RFC
2047-like headers where there is no whitespace between encoded words. This
fix changes the matching regexp to include a trailing lookahead assertion that
the closing ?= must be followed by whitespace, newline, or end-of-string.
This also changes the regexp to add the MULTILINE flag.
........
r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines
correct order and names of the less often used keyword parameters.
........
r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines
Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9"
now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform
items are all OS X special API specific since OS X is unixy enough for these modules
to be available out of the box.
........
r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines
Bug #767111: fix long-standing bug in urllib which caused an
AttributeError instead of an IOError when the server's response didn't
contain a valid HTTP status line.
........
r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
name. Remove a reference leak that happened if the name could not be
converted to string. Will backport.
........
r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines
Patch #1559413: Fix test_cmd_line if sys.executable contains a space.
Will backport.
........
r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines
Note how test_socket_ssl has various exceptions that deal with a flaky Net
connection are silenced.
........
r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines
Raise ResourceDenied in test_urllib2net when the Net connection goes bad.
........
r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line
Wrap a long line and fix a typo (is -> if)
........
r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1680978: consistently use "alive" instead of "active" in the
thread lib doc.
........
r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1681153: the wave module now closes a file object it opened if
initialization failed.
........
r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
the implementation for __reduce__ and __reduce_ex__ into two separate
functions. Fixes bug #931877. Will backport.
........
r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements.
Will backport.
........
r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines
Bug #1681228: the webbrowser module now correctly uses the default
GNOME or KDE browser, depending on whether there is a session of one
of those present. Also, it tries the Windows default browser before
trying Mozilla variants.
(backport)
........
r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines
Patch #1273829: os.walk() now has a "followlinks" parameter. If set to
True (which is not the default), it visits symlinks pointing to
directories.
........
r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines
Add \versionadded tag.
........
r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines
RFE #1670167: fix in isinstance() docs.
........
r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines
Patch #1623563: allow __class__ assignment for classes with __slots__.
The old and the new class are still required to have the same slot
names, but the order in which they are specified is not relevant.
........
r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines
Whitespace cleanup. Also remove the empty lines
from the previous check in.
........
r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines
Remove warning: funcion declaration isn't a prototype
........
r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines
Clean up formatting of this file.
The file should now follow PEP 7, except that it uses 4 space indents
(in the style of Py3k). This particular code would be really hard to
read with the regular tab idents.
Other changes:
- reflow long lines
- change multi-line conditionals to have test at end of line
........
r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line
Patch #1676994: Refactor test_popen2 to use unittest.
........
r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line
Remove test/output/test_popen2 (missed in r54417).
........
r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line
Patch 1339796: add a relpath() function to os.path.
........
r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines
Patch #1675423: PyComplex_AsCComplex() now tries to convert an object
to complex using its __complex__() method before falling back to the
__float__() method. Therefore, the functions in the cmath module now
can operate on objects that define a __complex__() method.
(backport)
........
r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines
move note to the correct section
........
r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines
Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf.
........
r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines
Patch #1678339: test case for bug in difflib.
........
r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line
Patch #1630118: add a SpooledTemporaryFile class to tempfile.
........
r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines
Patch #1683328: fixes and enhancements for "unparse" demo.
........
r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line
Add some doc that was left out from some change to platform.py
........
r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line
Add a comment about 3k migration
........
r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line
Get rid of deprecation warning when testing commands.getstatus()
........
r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines
Try backing out 54407 to see if it corrects the problems on the Windows
buildbots. This rev was backported, so we will need to keep both branches
in sync, pending the outcome of the test after this checkin.
........
r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line
Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-)
........
r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line
Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-)
........
r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines
Try to be a little more resilient to errors. This might help the test
pass, but my guess is that it won't. I'm guessing that some other
test is leaving this file open which means it can't be removed
under Windows AFAIK.
........
r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines
Try to get test_urllib to pass on Windows by closing the file.
I'm guessing that's the problem. h.getfile() must be called *after*
h.getreply() and the fp can be None.
I'm not entirely convinced this is the best fix (or even correct).
The buildbots will tell us if things improve or not. I don't
know if this needs to be backported (assuming it actually works).
........
r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line
Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability.
........
r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines
Fix for glob.py if filesystem encoding is None.
........
r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line
Remove unused file spotted by Paul Hankin
........
r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines
Patch #1682205: a TypeError while unpacking an iterable is no longer
masked by a generic one with the message "unpack non-sequence".
........
r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines
New test for rev. 54407 which only uses directories under TESTFN.
........
r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines
Patch #1684834: document some utility C API functions.
........
r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines
Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'.
........
r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line
Add comments on maintenance of this file
........
r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line
Fix sentence, and fix typo in example
........
r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line
Put code examples at left margin instead of indenting them
........
r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line
Minor clarification, saying that blocking means no timeout (from bug #882297)
........
r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines
Bug #1675967: re patterns pickled with older Python versions can
now be unpickled. Will backport.
........
r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line
Add test and fix for fromkeys() optional argument.
........
r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines
Bug #1685704: use -m switch in timeit docs.
........
r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines
Back out "Patch #1643874: memory leak in ctypes fixed."
The code in this patch leaves no way to give up the ownership of a
BSTR instance.
........
r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines
Explain the purpose of the b_needsfree flag (forward ported from release25-maint).
........
r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines
- Bug #1683368: The object.__init__() and object.__new__() methods are
now stricter in rejecting excess arguments. The only time when
either allows excess arguments is when it is not overridden and the
other one is. For backwards compatibility, when both are
overridden, it is a deprecation warning (for now; maybe a Py3k
warning later).
When merging this into 3.0, the warnings should become errors.
Note: without the change to string.py, lots of spurious warnings happen.
What's going on there?
........
r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line
Add Mark Dickinson for SF # 1675423.
........
r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines
Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}.
Will backport.
........
r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines
Bug #978833: Revert r50844, as it broke _socketobject.dup.
Will backport.
........
r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines
Add a type.__init__() method that enforces the same signature as
type.__new__(), and then calls object.__init__(cls), just to be anal.
This allows us to restore the code in string.py's _TemplateMetaclass
that called super(...).__init__(name, bases, dct), which I commented
out yesterday since it broke due to the stricter argument checking
added to object.__init__().
........
r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines
Added a 'create_connect()' function to socket.py, which creates a
connection with an optional timeout, and modified httplib.py to
use this function in HTTPConnection. Applies patch 1676823.
........
r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines
Add note about type.__init__().
........
r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines
Prevent creation (followed by a segfault) of array types when the size
overflows the valid Py_ssize_t range. Check return values of
PyMem_Malloc.
Will backport to release25-maint.
........
r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines
Surrounded with try/finally to socket's default timeout setting
changes in the tests, so failing one test won't produce strange
results in others. Also relaxed the timeout settings in the test
(where actually the value didn't mean anything).
........
r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line
Make test_relpath() pass on Windows.
........
r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines
Patch #1489771: update syntax rules in Python Reference Manual.
Python 2.5 added support for explicit relative import statements and
yield expressions, which were missing in the manual.
Also fix grammar productions that used the names from the Grammar file,
markup that broke the generated grammar.txt, and wrap some lines that
broke the pdf output. Will backport.
........
r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines
Remove typo accent.
........
r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines
Revert accidental change.
........
r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines
Change the docs to no longer claim that unittest is preferred over doctest for
regression tests.
........
r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines
Redone the tests, using the infrastructure already present
for threading and socket serving.
........
r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines
Closing the HTTP connection after each test, and listening more.
........
r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines
Markup fix.
........
r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines
Markup fix.
........
r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines
Added an optional timeout to FTP class. Also I started a test_ftplib.py
file to test the ftp lib (right now I included a basic test, the timeout
one, and nothing else).
........
r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines
Some nits.
........
r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines
Forgot to add the file before the previous commit, here go
the ftplib tests.
........
r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines
Added an optional timeout to poplib.POP3. Also created a
test_poplib.py file with a basic test and the timeout
ones. Docs are also updated.
........
r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines
The basic test cases of poplib.py.
........
r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines
Bug 1688393. Adds a control of negative values in
socket.recvfrom, which caused an ugly crash.
........
r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines
Added timeout to smtplib (to SMTP and SMTP_SSL). Also created
the test_smtplib.py file, with a basic test and the timeout
ones. Docs are updated too.
........
r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines
Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file.
Thanks to Jerry Seutter for all three patches.
........
r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line
Make test_zipfile clean up its temporary files properly.
........
r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines
These are actually methods.
........
r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines
In Windows' time.clock(), when QueryPerformanceFrequency() fails,
the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC
as for the POSIX implementation (thanks to #pypy).
........
r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines
Added timout parameter to telnetlib.Telnet. Also created
test_telnetlib.py with a basic test and timeout ones.
Docs are also updated.
........
r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines
Added the posibility to pass the timeout to FTP.connect, not only when
instantiating the class. Docs and tests are updated.
........
r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line
Bug #1688274: add documentation for C-level class objects.
........
r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines
Bump the patch level version of distutils since there were a few bug fixes since
the 2.5.0 release.
........
r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines
Label name fix.
........
r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines
Duplicate label fix.
........
r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line
Add item. (Oops, accidentally checked this in on my branch)
........
r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines
Duplicate label fix.
........
r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines
repair string literal.
........
r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines
Markup fix.
........
r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines
Duplicate label fix.
........
r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines
Typo fix.
........
r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line
Fix method names. Will backport.
........
r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines
Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS
returned by python-config if Python was built with --enable-shared
because that prevented the shared library from being used.
........
r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line
Shut up an occaisonal buildbot error due to test files being left around.
........
r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines
SF #1685563, MSVCCompiler creates redundant and long PATH strings
If MSVCCompiler.initialize() was called multiple times, the path
would get duplicated. On Windows, this is a problem because the
path is limited to 4k. There's no benefit in adding a path multiple
times, so prevent that from occuring. We also normalize the path
before checking for duplicates so things like /a and /a/ won't both
be stored.
Will backport.
........
r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines
time.strptime's caching of its locale object was being recreated when the
locale changed but not used during the function call it was recreated during.
The test in this checkin is untested (OS X does not have the proper locale
support for me to test), although the fix for the bug this deals with
was tested by the OP (#1290505). Once the buildbots verify the test at least
doesn't fail it becomes a backport candidate.
........
r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines
Fix the test for recreating the locale cache object by not worrying about if
one of the test locales cannot be set.
........
r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines
Fix a lot of markup and meta-information glitches.
........
r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines
Another fix.
........
r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines
Lots of explicit class names for method and member descs.
........
r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines
Explicit class names.
........
r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines
Some semantic fixes.
........
r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines
Remove bogus entry.
........
r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines
Fix the class name of strings.
........
r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line
SF #1693079: Cannot save empty array in shelve
........
r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines
Array module's buffer interface can now handle empty arrays.
........
r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines
Fix warnings about object.__init__() signature.
Two (test_array and test_descr) were bug IMO; the third (copy_reg)
is a work-around which recognizes that object.__init__() doesn't do
anything.
........
r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line
SF 1602378 Clarify docstrings for bisect
........
r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines
SF #1382213: Tutorial section 9.5.1 ignores MRO for new-style classes
........
r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines
- Fix an off-by-one bug in locale.strxfrm().
patch taken from http://bugs.debian.org/416934.
........
r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines
Fix the strange case of
\begin{methoddesc}[NNTP]{...}
where
\ifx#1\@undefined ended up comparing N and N, therefore executing
the true part of the conditional, blowing up at \@undefined.
........
r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines
Now using unittest for the tests infraestructure. Also split the
tests in those who need the network, and that who doesn't.
........
r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines
Move the functionality for catching warnings in test_warnings.py into a separate
class to that reusing the functionality in test_structmembers.py doesn't rerun
the tests from test_warnings.py.
........
r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines
Document that CatchWarningTests is reused by test_structmembers.py.
........
r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines
Add tests for the filename.
Test that the stacklevel is handled correctly.
........
r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines
Added a SSL server to test_socket_ssl.py to be able to test
locally. Now, it checks if have openssl available and run
those specific tests (it starts openssl at the beggining of
all the tests and then kills it at the end).
........
r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines
Implement a contextmanager test.test_support.catch_warning that can
be used to catch the last warning issued by the warning framework.
Change test_warnings.py and test_structmembers.py to use this
new contextmanager.
........
r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines
Changed the whole structure of startup and checking if the
server is available. Hope to not get more false alarms.
........
r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines
Fixed the way that the .pem files are looked for, and changed
how to kill the process in win32 to use the _handle attribute.
........
r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines
Fix a race condition in this test -- instead of assuming that it will take
the test server thread at most 0.5 seconds to get ready, use an event
variable.
........
r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line
Clean up imports.
........
r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line
Stop using test_support.verify().
........
r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines
Bug #1686475: Support stat'ing open files on Windows again.
Will backport to 2.5.
........
r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line
Make test_getopt use unittest.
........
r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line
Make test_softspace use unittest.
........
r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines
Fix WalkTests.test_traversal() on Windows. The cleanup in
MakedirTests.setUp() can now be removed.
........
r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines
Bug #1563759: struct.unpack doens't support buffer protocol objects
........
r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line
Convert test_long_future to use unittest.
........
r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line
Convert test_normalization to use unittest.
........
r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line
Some grammar fixes
........
r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_stringprep to use unittest.
........
r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line
Import cleanup in test_crypt.
........
r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_gc to use unittest.
........
r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_module to use unittest.
........
r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_fileinput to use unittest.
........
r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines
Doc that file.next() has undefined behaviour when called on a file opened with
'w'. Closes bug #1569057.
To be backported once 2.5 branch is unfrozen.
........
r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line
Added optional timeout to SocketHandler.makeSocket (SF #1695948)
........
r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines
Patch #1695862: remove old test directory that causes test_urllib failures
on Windows buildbots. The change is a one time fix and will be removed
after a successful buildbot run.
........
r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines
Minor fix to the tests pass ok even with -O.
........
r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line
Typo fix.
........
r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines
General clean-up. Lot of margin corrections, comments, some typos.
Exceptions now are raised in the new style. And a mockup class is
now also new style. Thanks Santiago Pereson.
........
r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines
Repair a duplicate label and some obsolete uses of \setindexsubitem.
........
r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line
Add window.chgat() method, submitted via e-mail by Fabian Kreutz
........
r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line
Point readers at the patch submission instructions
........
r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line
Describe undocumented third argument to touchline()
........
r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines
Add some missing NULL checks which trigger crashes on low-memory conditions.
Found by Victor Stinner. Will backport when 2.5 branch is unfrozen.
........
r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line
SF 1191699: Make slices picklable
........
r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines
Exceptions are no longer old-style instances. Fix accordingly.
........
r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines
Repair missing spaces after \UNIX.
........
r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line
SF 1193128: Let str.translate(None) be an identity transformation
........
r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines
Patch #1698951: clarify deprecation message in rexec and Bastion
........
r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines
Patch #1695862: remove the cleanup code, now that Windows buildbots are green
again.
........
r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines
Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the
first chunk fed to the decoder started with a BOM, but was longer than 3 bytes.
........
r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines
Port r54805 from python25-maint branch:
Add code to read from master_fd in the parent, breaking when we get an OSError
(EIO can occur on Linux) or there's no more data to read. Without this,
test_pty.py can hang on the waitpid() because the child is blocking on the
stdout write. This will definitely happen on Mac OS X and could potentially
happen on other platforms. See the comment for details.
........
r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line
Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127
........
r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line
Fix potential crash in path manipulation on windows
........
r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines
Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore'
is built before '_ctypes' is attempted.
Will backport to 2.5 once it is unfrozen for 2.5.1.
........
r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines
When __slots__ are set to a unicode string, make it work the same as
setting a plain string, ie don't expand to single letter identifiers.
........
r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line
SF #1701207, Fix bogus assertion (and test it!)
........
r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line
Check the availability of the urlfetch resource earlier than before.
........
r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines
Add Travis Oliphant.
........
r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines
Silence a compiler warning about incompatible pointer types.
........
r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines
SF #1703270, add missing declaration in readline.c to avoid compiler warning.
........
r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines
Revert r53997 as per
http://mail.python.org/pipermail/python-dev/2007-March/071796.html .
I've kept a couple of still-valid extra tests in test_descr, but didn't
bother to sort through the new comments and refactorings added in r53997
to see if some of them could be kept. If so, they could go in a
follow-up check-in.
........
r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines
Fix a usage of the dangerous pattern decref - modify field - incref.
........
r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines
Add an optional address to copy the failure mails to.
Detect a conflict in the only file that should have outstanding changes
when this script is run. This doesn't matter on the trunk, but does
when run on a branch. Trunk always has the date set to today in
boilerplate.tex. Each time a release is cut with a different date,
a conflict occurs. (We could copy a known good version, but then
we would lose changes to this file.)
........
r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines
Bug #1704790: bind name "sys" locally in __del__ method so that it is
not cleared before __del__ is run.
........
r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines
Added tests for other methods of SSL object. Now we cover
all the object methods. This is the final step to close
the #451607 bug.
........
r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines
As specified in RFC 2616, 2xx code indicates that the client's
request was successfully received, understood, and accepted.
Now in these cases no error is raised. Also fixed tests.
........
r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line
Convert PyUnit -> unittest.
........
r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line
Remove code that hasn't been called in years.
........
r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line
Fix SF #1703110, Incorrect example for add_password() (use uri, not host)
........
r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines
Some new year updates.
........
r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines
Added a comment about last change in urllib2.py (all 2xx responses
are ok now).
........
r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines
Bug #1705717: error in sys.argv docs.
........
r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines
Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file
(as opposed to the command line) will now write file names ending in
".cpp" too.
........
r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line
Fix markup
........
r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line
Merge change 54909 from release25-maint: Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition
........
r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line
Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h
........
r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line
Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now.
........
r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines
Patch #1698768: updated the "using Python on the Mac" intro.
........
r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines
Markup fix.
........
r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines
Whitespace normalization. Ugh, we really need to do this more often.
You might want to review this change as it's my first time. Be gentle. :-)
........
r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line
Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule().
........
r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line
Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing.
........
r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line
Change test_support.have_unicode to use True/False instead of 1/0.
........
r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines
Whitespace normalization.
........
r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines
Set missing svn:eol-style property on text files.
........
r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line
Import and raise statement cleanup.
........
r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line
Convert test_ossaudiodev to use unittest.
........
r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line
Fix an issue related to the unittest conversion.
........
r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line
fix some markup errors
........
r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line
Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode(). Use this function in posixmodule.c when implementing fdopen(). This fixes test_subprocess.py for a VisualStudio 2005 compile.
........
r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line
The locale "En" appears not to be valid on windows underi VisualStudio.2005. Added "English" to the test_locale.py to make the testsuite pass for that build
........
r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line
Minor wording change on slicing aide-memoire.
........
r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line
Accomodate 64 bit time_t in the _bsddb module.
........
2007-04-28 03:54:29 +08:00
|
|
|
raise self.error("command %s illegal in state %s, "
|
|
|
|
"only allowed in states %s" %
|
|
|
|
(command, self.state,
|
|
|
|
', '.join(Commands[command])))
|
2001-01-15 07:47:14 +08:00
|
|
|
name = 'UID'
|
2003-02-28 04:14:51 +08:00
|
|
|
typ, dat = self._simple_command(name, command, *args)
|
2010-08-01 06:32:52 +08:00
|
|
|
if command in ('SEARCH', 'SORT', 'THREAD'):
|
2001-07-20 18:52:06 +08:00
|
|
|
name = command
|
2001-01-15 07:47:14 +08:00
|
|
|
else:
|
|
|
|
name = 'FETCH'
|
|
|
|
return self._untagged_response(typ, dat, name)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def unsubscribe(self, mailbox):
|
|
|
|
"""Unsubscribe from old mailbox.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.unsubscribe(mailbox)
|
|
|
|
"""
|
|
|
|
return self._simple_command('UNSUBSCRIBE', mailbox)
|
|
|
|
|
|
|
|
|
|
|
|
def xatom(self, name, *args):
|
|
|
|
"""Allow simple extension commands
|
|
|
|
notified by server in CAPABILITY response.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-07-20 18:52:06 +08:00
|
|
|
Assumes command is legal in current state.
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, [data]) = <instance>.xatom(name, arg, ...)
|
2001-07-20 18:52:06 +08:00
|
|
|
|
|
|
|
Returns response appropriate to extension command `name'.
|
2001-01-15 07:47:14 +08:00
|
|
|
"""
|
2001-07-20 18:52:06 +08:00
|
|
|
name = name.upper()
|
2001-07-21 09:41:30 +08:00
|
|
|
#if not name in self.capabilities: # Let the server decide!
|
2001-07-20 18:52:06 +08:00
|
|
|
# raise self.error('unknown extension command: %s' % name)
|
2002-06-01 22:18:47 +08:00
|
|
|
if not name in Commands:
|
2001-07-20 18:52:06 +08:00
|
|
|
Commands[name] = (self.state,)
|
2003-02-28 04:14:51 +08:00
|
|
|
return self._simple_command(name, *args)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
|
|
|
|
# Private methods
|
|
|
|
|
|
|
|
|
|
|
|
def _append_untagged(self, typ, dat):
|
2008-11-06 03:39:50 +08:00
|
|
|
if dat is None:
|
|
|
|
dat = b''
|
2001-01-15 07:47:14 +08:00
|
|
|
ur = self.untagged_responses
|
|
|
|
if __debug__:
|
|
|
|
if self.debug >= 5:
|
2008-11-06 03:39:50 +08:00
|
|
|
self._mesg('untagged_responses[%s] %s += ["%r"]' %
|
2001-01-15 07:47:14 +08:00
|
|
|
(typ, len(ur.get(typ,'')), dat))
|
2002-06-01 22:18:47 +08:00
|
|
|
if typ in ur:
|
2001-01-15 07:47:14 +08:00
|
|
|
ur[typ].append(dat)
|
|
|
|
else:
|
|
|
|
ur[typ] = [dat]
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def _check_bye(self):
|
|
|
|
bye = self.untagged_responses.get('BYE')
|
|
|
|
if bye:
|
2015-05-11 07:17:23 +08:00
|
|
|
raise self.abort(bye[-1].decode(self._encoding, 'replace'))
|
1999-12-14 07:27:45 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def _command(self, name, *args):
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if self.state not in Commands[name]:
|
|
|
|
self.literal = None
|
Merged revisions 53952-54987 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines
Do not copy free variables to locals in class namespaces.
Fixes bug 1569356, but at the cost of a minor incompatibility in
locals(). Add test that verifies that the class namespace is not
polluted. Also clarify the behavior in the library docs.
Along the way, cleaned up the dict_to_map and map_to_dict
implementations and added some comments that explain what they do.
........
r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines
Fix assertion.
........
r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines
When printing an unraisable error, don't print exceptions. before the name.
This duplicates the behavior whening normally printing exceptions.
........
r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line
Markup fix
........
r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines
SF #1669182, 2.5 was already fixed. Just assert in 2.6 since string exceptions
are gone.
........
r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line
Add some items
........
r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines
Fix long-standing bug in name mangling for package imports
Reported by Mike Verdone.
........
r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines
tabify
........
r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines
tabify
Note that ast.c still has a mix of tabs and spaces, because it
attempts to use four-space indents for more of the new code.
........
r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines
whitespace normalization
........
r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines
Add checking for a number of metaclass error conditions.
We add some new rules that are required for preserving internal
invariants of types.
1. If type (or a subclass of type) appears in bases, it must appear
before any non-type bases. If a non-type base (like a regular
new-style class) occurred first, it could trick type into
allocating the new class an __dict__ which must be impossible.
2. There are several checks that are made of bases when creating a
type. Those checks are now repeated when assigning to __bases__.
We also add the restriction that assignment to __bases__ may not
change the metaclass of the type.
Add new tests for these cases and for a few other oddball errors that
were no previously tested. Remove a crasher test that was fixed.
Also some internal refactoring: Extract the code to find the most
derived metaclass of a type and its bases. It is now needed in two
places. Rewrite the TypeError checks in test_descr to use doctest.
The tests now clearly show what exception they expect to see.
........
r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines
Add news about changes to metaclasses and __bases__ error checking.
........
r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines
Modify the segfaulting example to show why r53997 is not a solution to
it.
........
r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines
Add a test for instantiating SyntaxError with no arguments.
........
r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line
Docstring nit.
........
r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line
Prepare collections module for pure python code entries.
........
r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line
Add collections.NamedTuple
........
r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line
Add Pat and Eric for work on PEP 3101 in the sandbox
........
r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line
Add NamedTuple
........
r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines
Bug #1628895: some better tries to find HTML documentation in pydoc.
........
r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line
Fix embarrassing typo and fix constantification of None
........
r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines
Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize.
........
r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines
Fix a bug in test_dict and test_userdict, found at the PyPy sprint.
........
r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines
Teach setup.py how to find Berkeley DB on Macs using MacPorts.
........
r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line
note MacPorts/BerkDB change in setup.py
........
r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line
Added Pete for 3101 too
........
r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line
Minor corrections to docs, and an explanation comentary
........
r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines
Patch #1674228: when assigning a slice (old-style), check for the
sq_ass_slice instead of the sq_slice slot.
........
r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines
Nit: a struct field is set to GenericAlloc, not GenericAlloc().
........
r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1671450: add a section about subclassing builtin types to the
"extending and embedding" tutorial.
........
r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1121142: Implement ZipFile.open.
........
r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines
A test case for the fix in #1674228.
........
r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1672481: fix bug in idlelib.MultiCall.
........
r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line
Bug #1674503: close the file opened by execfile() in an error condition.
........
r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines
Fix another reincarnation of bug #1576657 in defaultdict.
........
r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines
A test case for the defaultdict KeyError bug.
........
r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1663234: you can now run doctest on test files and modules
using "python -m doctest [-v] filename ...".
........
r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #912410: Replace HTML entity references for attribute values
in HTMLParser.
........
r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line
patch 1673619 - identify extension modules which cannot be built
........
r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines
Patch #1646728: datetime.fromtimestamp fails with negative
fractional times. With unittest.
Somebody please backport to 2.5.
........
r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines
Fix cmp vs. key argument for list.sort.
........
r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines
Small nit, found by Neal.
........
r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1602128: clarify that richcmp methods can return NotImplemented
and should return True or False otherwise.
........
r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1638879: don't accept strings with embedded NUL bytes in long().
........
r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1673121: update README wrt. OSX default shell.
........
r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1654417: make operator.{get,set,del}slice use the full range
of Py_ssize_t.
........
r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines
Patch for bug #1633621: if curses.resizeterm() or
curses.resize_term() is called, update _curses.LINES,
_curses.COLS, curses.LINES and curses.COLS.
........
r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Document change to curses.
........
r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines
Variant of patch #697613: don't exit the interpreter on a SystemExit
exception if the -i command line option or PYTHONINSPECT environment
variable is given, but break into the interactive interpreter just like
on other exceptions or normal program exit.
(backport)
........
r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines
Patch #703779: unset __file__ in __main__ after running a file. This
makes the filenames the warning module prints much more sensible when
a PYTHONSTARTUP file is used.
........
r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines
add versionadded info
........
r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler.
........
r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines
Patch #1001604: glob.glob() now returns unicode filenames if it was
given a unicode argument and os.listdir() returns unicode filenames.
........
r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines
Patches #1550273, #1550272: fix a few bugs in unittest and add a
comprehensive test suite for the module.
........
r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines
Patch #787789: allow to pass custom TestRunner instances to unittest's
main() function.
........
r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines
Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position.
........
r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines
Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', '').
........
r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines
Patch #1675471: convert test_pty to unittest.
........
r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines
Add some sanity checks to unittest.TestSuite's addTest(s) methods.
Fixes #878275.
........
r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines
Windows doesn't support negative timestamps. Skip the tests involving them
if os.name == "nt".
........
r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines
Add missing ) in parenthical remark.
........
r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines
Fix #1676656: \em is different from \emph...
........
r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines
Add a NEWS entry for rev. 54207,8.
........
r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line
SF 1676321: empty() returned wrong result
........
r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line
Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order.
........
r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line
SF #1637850: make_table in difflib did not work with unicode
........
r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line
Patch #1668482: don't use '-' in mkstemp
........
r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines
Introduce test.test_support.TransientResource. It's a context manager to
surround calls to resources that may or may not be available. Specifying the
expected exception and attributes to be raised if the resource is not available
prevents overly broad catching of exceptions.
This is meant to help suppress spurious failures by raising
test.test_support.ResourceDenied if the exception matches. It would probably
be good to go through the various network tests and surround the calls to catch
connection timeouts (as done with test_socket_ssl in this commit).
........
r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line
Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py
........
r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line
Add NEWS item for patch #1481079 (r54234).
........
r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line
Fix SF #1676971, Complex OverflowError has a typo
........
r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines
Typo.
........
r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines
Patch #957003: Implement smtplib.LMTP.
........
r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines
Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822.
........
r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines
Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0)
returned string up to the first NUL character.
........
r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines
Add Ziga Seilnacht.
........
r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines
Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError.
........
r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines
Bug #1651235: When a tuple was passed to a ctypes function call,
Python would crash instead of raising an error.
The crash was caused by a section of code that should have been
removed long ago, at that time ctypes had other ways to pass
parameters to function calls.
........
r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line
Hashing simplification pointed out by Thomas Wouters.
........
r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines
* Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink.
* Drop safe_remove() in favor of test_support.unlink().
* Fix the indentation of test_samefile so that it runs.
........
r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines
Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket.
Will backport.
........
r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines
Simplify a little by handling the TCP case first.
Update to use predominant style of spaces around = in args list
and print to stderr if debugging.
........
r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line
Add proper attribution for a bug fix.
........
r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines
Typos.
........
r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line
Convert an assert to a raise so it works even in the presence of -O.
........
r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines
Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer.
........
r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines
Add missing "return" statements in exception handler.
........
r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines
Patch #1675981: remove unreachable code from type.__new__() method.
__dict__ and __weakref__ are removed from the slots tuple earlier
in the code, in the loop that mangles slot names. Will backport.
........
r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines
Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number.
Will backport.
........
r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line
Fix resource leak reported in SF #1516995.
........
r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines
Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more
stable FTP.
Will backport.
........
r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines
Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the
display name of an email address, e.g.
Foo
\tBar <foo@example.com>
Test case added by Barry.
........
r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines
Sane humans would call these invalid tests, but Andrew McNamara pointed out
that given the inputs in these tests Excel does indeed produce the output
these tests expect. Document that for future confused folks.
........
r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines
Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86.
........
r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines
Patch #1677862: Require a space or tab after import in .pth files.
........
r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines
Backport from Py3k branch:
Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir.
Had to change a few bits of the patch because classobjs and __methods__ are still
in Py2.6.
........
r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines
Bug #1678647: write a newline after printing an exception in any
case, even when converting the value to a string failed.
........
r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line
Patch #1678088: convert test_operations to use unittest, fold the result into test_dict.
........
r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines
Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167.
Will backport.
........
r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines
Typo fix.
........
r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line
Patch #1670993: Refactor test_threadedtempfile.py to use unittest.
........
r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines
Whitespace normalization.
........
r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines
Set missing svn:eol-style property on text files.
........
r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines
Add test.test_support.transient_internet . Returns a context manager that
nests test.test_support.TransientResource context managers that capture
exceptions raised when the Internet connection is flaky.
Initially using in test_socket_ssl but should probably be expanded to cover any
test that should not raise the captured exceptions if the Internet connection
works.
........
r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines
Fix a typo where the variable name was not updated.
........
r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line
Add Jerry Seutter for a bunch of his recent patches refactoring tests
........
r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines
Add some other acks for recent checkins:
Brian Leair - 922167
Tomer Filiba - 1591665
Jeremy Jones - 1192590
........
r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines
Fix some style nits:
* lines too long
* wrong indentation
* space after a function name
* wrong function name in error string
* simplifying some logic
Also add an error check to PyDict_SetItemString.
........
r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines
Typo and grammar fixes.
........
r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1679379: add documentation for fnmatch.translate().
........
r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1642844: comments to clarify the complexobject constructor.
........
r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1668100: urllib2 now correctly raises URLError instead of
OSError if accessing a local file via the file:// protocol fails.
........
r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1635454: the csv.DictWriter class now includes the offending
field names in its exception message if you try to write a record with
a dictionary containing fields not in the CSV field names list.
........
r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1555098: use str.join() instead of repeated string
concatenation in robotparser.
........
r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to
pydoc's help keywords.
........
r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1569798: fix a bug in distutils when building Python from a
directory within sys.exec_prefix.
........
r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1449244: Support Unicode strings in
email.message.Message.{set_charset,get_content_charset}.
Will backport.
........
r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines
This is the implementation of POSIX.1-2001 (pax) format read/write
support.
The TarInfo class now contains all necessary logic to process and
create tar header data which has been moved there from the TarFile
class. The fromtarfile() method was added. The new path and linkpath
properties are aliases for the name and linkname attributes in
correspondence to the pax naming scheme.
The TarFile constructor and classmethods now accept a number of
keyword arguments which could only be set as attributes before (e.g.
dereference, ignore_zeros). The encoding and pax_headers arguments
were added for pax support. There is a new tarinfo keyword argument
that allows using subclassed TarInfo objects in TarFile.
The boolean TarFile.posix attribute is deprecated, because now three
tar formats are supported. Instead, the desired format for writing is
specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT
as the format keyword argument. This change affects TarInfo.tobuf()
as well.
The test suite has been heavily reorganized and partially rewritten.
A new testtar.tar was added that contains sample data in many formats
from 4 different tar programs.
Some bugs and quirks that also have been fixed:
Directory names do no longer have a trailing slash in TarInfo.name or
TarFile.getnames().
Adding the same file twice does not create a hardlink file member.
The TarFile constructor does no longer need a name argument.
The TarFile._mode attribute was renamed to mode and contains either
'r', 'w' or 'a'.
........
r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines
Bug #1622896: fix a rare corner case where the bz2 module raised an
error in spite of a succesful compression.
........
r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines
Quick fix for tests that fail on systems with an encoding other
than 'iso8859-1'.
........
r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1603688: ConfigParser.SafeConfigParser now checks values that
are set for invalid interpolation sequences that would lead to errors
on reading back those values.
........
r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1581073: add a flag to textwrap that prevents the dropping of
whitespace while wrapping.
........
r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1605192: list allowed states in error messages for imaplib.
........
r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter
which can be set to False to prevent the default delete-on-close
behavior.
........
r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines
Add acks for recent patch checkins:
Arvin Schnell - 1668482
S?\195?\169bastien Martini - 1481079
Heiko Wundram - 1491866
Damon Kohler - 1545011
Peter Parente - 1599845
Bjorn Lindqvist - 1678662
........
r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines
Acks for recent patches.
........
r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines
Fix a tab.
........
r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1533909: the timeit module now accepts callables in addition to
strings for the code to time and the setup code. Also added two
convenience functions for instantiating a Timer and calling its methods.
........
r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1530482: add pydoc.render_doc() which returns the documentation
for a thing instead of paging it to stdout, which pydoc.doc() does.
........
r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line
Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl.
........
r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1444529: the builtin compile() now accepts keyword arguments.
(backport)
........
r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line
Add versionadded marker for ctypes.c_bool.
........
r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1393667: pdb now has a "run" command which restarts the debugged
Python program, optionally with different arguments.
........
r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines
Deprecate commands.getstatus().
........
r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines
NEWS entry for getstatus() deprecation.
........
r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1429539: pdb now correctly initializes the __main__ module for
the debugged script, which means that imports from __main__ work
correctly now.
........
r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #957650: "%var%" environment variable references are now properly
expanded in ntpath.expandvars(), also "~user" home directory references
are recognized and handled on Windows.
........
r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1194449: correctly detect unbound methods in pydoc.
........
r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines
Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters
with ASCII value less than 32. Also, it correctly quotes dots only if
they occur on a single line, as opposed to the previous behavior of
quoting dots if they are the second character of any line.
........
r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line
Inline PyImport_GetModulesReloading().
........
r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines
SF bug #1582282; decode_header() incorrectly splits not-conformant RFC
2047-like headers where there is no whitespace between encoded words. This
fix changes the matching regexp to include a trailing lookahead assertion that
the closing ?= must be followed by whitespace, newline, or end-of-string.
This also changes the regexp to add the MULTILINE flag.
........
r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines
correct order and names of the less often used keyword parameters.
........
r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines
Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9"
now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform
items are all OS X special API specific since OS X is unixy enough for these modules
to be available out of the box.
........
r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines
Bug #767111: fix long-standing bug in urllib which caused an
AttributeError instead of an IOError when the server's response didn't
contain a valid HTTP status line.
........
r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
name. Remove a reference leak that happened if the name could not be
converted to string. Will backport.
........
r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines
Patch #1559413: Fix test_cmd_line if sys.executable contains a space.
Will backport.
........
r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines
Note how test_socket_ssl has various exceptions that deal with a flaky Net
connection are silenced.
........
r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines
Raise ResourceDenied in test_urllib2net when the Net connection goes bad.
........
r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line
Wrap a long line and fix a typo (is -> if)
........
r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1680978: consistently use "alive" instead of "active" in the
thread lib doc.
........
r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1681153: the wave module now closes a file object it opened if
initialization failed.
........
r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
the implementation for __reduce__ and __reduce_ex__ into two separate
functions. Fixes bug #931877. Will backport.
........
r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements.
Will backport.
........
r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines
Bug #1681228: the webbrowser module now correctly uses the default
GNOME or KDE browser, depending on whether there is a session of one
of those present. Also, it tries the Windows default browser before
trying Mozilla variants.
(backport)
........
r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines
Patch #1273829: os.walk() now has a "followlinks" parameter. If set to
True (which is not the default), it visits symlinks pointing to
directories.
........
r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines
Add \versionadded tag.
........
r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines
RFE #1670167: fix in isinstance() docs.
........
r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines
Patch #1623563: allow __class__ assignment for classes with __slots__.
The old and the new class are still required to have the same slot
names, but the order in which they are specified is not relevant.
........
r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines
Whitespace cleanup. Also remove the empty lines
from the previous check in.
........
r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines
Remove warning: funcion declaration isn't a prototype
........
r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines
Clean up formatting of this file.
The file should now follow PEP 7, except that it uses 4 space indents
(in the style of Py3k). This particular code would be really hard to
read with the regular tab idents.
Other changes:
- reflow long lines
- change multi-line conditionals to have test at end of line
........
r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line
Patch #1676994: Refactor test_popen2 to use unittest.
........
r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line
Remove test/output/test_popen2 (missed in r54417).
........
r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line
Patch 1339796: add a relpath() function to os.path.
........
r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines
Patch #1675423: PyComplex_AsCComplex() now tries to convert an object
to complex using its __complex__() method before falling back to the
__float__() method. Therefore, the functions in the cmath module now
can operate on objects that define a __complex__() method.
(backport)
........
r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines
move note to the correct section
........
r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines
Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf.
........
r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines
Patch #1678339: test case for bug in difflib.
........
r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line
Patch #1630118: add a SpooledTemporaryFile class to tempfile.
........
r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines
Patch #1683328: fixes and enhancements for "unparse" demo.
........
r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line
Add some doc that was left out from some change to platform.py
........
r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line
Add a comment about 3k migration
........
r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line
Get rid of deprecation warning when testing commands.getstatus()
........
r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines
Try backing out 54407 to see if it corrects the problems on the Windows
buildbots. This rev was backported, so we will need to keep both branches
in sync, pending the outcome of the test after this checkin.
........
r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line
Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-)
........
r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line
Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-)
........
r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines
Try to be a little more resilient to errors. This might help the test
pass, but my guess is that it won't. I'm guessing that some other
test is leaving this file open which means it can't be removed
under Windows AFAIK.
........
r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines
Try to get test_urllib to pass on Windows by closing the file.
I'm guessing that's the problem. h.getfile() must be called *after*
h.getreply() and the fp can be None.
I'm not entirely convinced this is the best fix (or even correct).
The buildbots will tell us if things improve or not. I don't
know if this needs to be backported (assuming it actually works).
........
r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line
Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability.
........
r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines
Fix for glob.py if filesystem encoding is None.
........
r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line
Remove unused file spotted by Paul Hankin
........
r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines
Patch #1682205: a TypeError while unpacking an iterable is no longer
masked by a generic one with the message "unpack non-sequence".
........
r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines
New test for rev. 54407 which only uses directories under TESTFN.
........
r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines
Patch #1684834: document some utility C API functions.
........
r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines
Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'.
........
r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line
Add comments on maintenance of this file
........
r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line
Fix sentence, and fix typo in example
........
r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line
Put code examples at left margin instead of indenting them
........
r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line
Minor clarification, saying that blocking means no timeout (from bug #882297)
........
r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines
Bug #1675967: re patterns pickled with older Python versions can
now be unpickled. Will backport.
........
r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line
Add test and fix for fromkeys() optional argument.
........
r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines
Bug #1685704: use -m switch in timeit docs.
........
r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines
Back out "Patch #1643874: memory leak in ctypes fixed."
The code in this patch leaves no way to give up the ownership of a
BSTR instance.
........
r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines
Explain the purpose of the b_needsfree flag (forward ported from release25-maint).
........
r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines
- Bug #1683368: The object.__init__() and object.__new__() methods are
now stricter in rejecting excess arguments. The only time when
either allows excess arguments is when it is not overridden and the
other one is. For backwards compatibility, when both are
overridden, it is a deprecation warning (for now; maybe a Py3k
warning later).
When merging this into 3.0, the warnings should become errors.
Note: without the change to string.py, lots of spurious warnings happen.
What's going on there?
........
r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line
Add Mark Dickinson for SF # 1675423.
........
r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines
Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}.
Will backport.
........
r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines
Bug #978833: Revert r50844, as it broke _socketobject.dup.
Will backport.
........
r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines
Add a type.__init__() method that enforces the same signature as
type.__new__(), and then calls object.__init__(cls), just to be anal.
This allows us to restore the code in string.py's _TemplateMetaclass
that called super(...).__init__(name, bases, dct), which I commented
out yesterday since it broke due to the stricter argument checking
added to object.__init__().
........
r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines
Added a 'create_connect()' function to socket.py, which creates a
connection with an optional timeout, and modified httplib.py to
use this function in HTTPConnection. Applies patch 1676823.
........
r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines
Add note about type.__init__().
........
r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines
Prevent creation (followed by a segfault) of array types when the size
overflows the valid Py_ssize_t range. Check return values of
PyMem_Malloc.
Will backport to release25-maint.
........
r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines
Surrounded with try/finally to socket's default timeout setting
changes in the tests, so failing one test won't produce strange
results in others. Also relaxed the timeout settings in the test
(where actually the value didn't mean anything).
........
r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line
Make test_relpath() pass on Windows.
........
r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines
Patch #1489771: update syntax rules in Python Reference Manual.
Python 2.5 added support for explicit relative import statements and
yield expressions, which were missing in the manual.
Also fix grammar productions that used the names from the Grammar file,
markup that broke the generated grammar.txt, and wrap some lines that
broke the pdf output. Will backport.
........
r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines
Remove typo accent.
........
r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines
Revert accidental change.
........
r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines
Change the docs to no longer claim that unittest is preferred over doctest for
regression tests.
........
r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines
Redone the tests, using the infrastructure already present
for threading and socket serving.
........
r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines
Closing the HTTP connection after each test, and listening more.
........
r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines
Markup fix.
........
r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines
Markup fix.
........
r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines
Added an optional timeout to FTP class. Also I started a test_ftplib.py
file to test the ftp lib (right now I included a basic test, the timeout
one, and nothing else).
........
r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines
Some nits.
........
r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines
Forgot to add the file before the previous commit, here go
the ftplib tests.
........
r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines
Added an optional timeout to poplib.POP3. Also created a
test_poplib.py file with a basic test and the timeout
ones. Docs are also updated.
........
r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines
The basic test cases of poplib.py.
........
r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines
Bug 1688393. Adds a control of negative values in
socket.recvfrom, which caused an ugly crash.
........
r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines
Added timeout to smtplib (to SMTP and SMTP_SSL). Also created
the test_smtplib.py file, with a basic test and the timeout
ones. Docs are updated too.
........
r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines
Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file.
Thanks to Jerry Seutter for all three patches.
........
r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line
Make test_zipfile clean up its temporary files properly.
........
r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines
These are actually methods.
........
r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines
In Windows' time.clock(), when QueryPerformanceFrequency() fails,
the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC
as for the POSIX implementation (thanks to #pypy).
........
r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines
Added timout parameter to telnetlib.Telnet. Also created
test_telnetlib.py with a basic test and timeout ones.
Docs are also updated.
........
r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines
Added the posibility to pass the timeout to FTP.connect, not only when
instantiating the class. Docs and tests are updated.
........
r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line
Bug #1688274: add documentation for C-level class objects.
........
r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines
Bump the patch level version of distutils since there were a few bug fixes since
the 2.5.0 release.
........
r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines
Label name fix.
........
r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines
Duplicate label fix.
........
r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line
Add item. (Oops, accidentally checked this in on my branch)
........
r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines
Duplicate label fix.
........
r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines
repair string literal.
........
r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines
Markup fix.
........
r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines
Duplicate label fix.
........
r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines
Typo fix.
........
r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line
Fix method names. Will backport.
........
r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines
Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS
returned by python-config if Python was built with --enable-shared
because that prevented the shared library from being used.
........
r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line
Shut up an occaisonal buildbot error due to test files being left around.
........
r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines
SF #1685563, MSVCCompiler creates redundant and long PATH strings
If MSVCCompiler.initialize() was called multiple times, the path
would get duplicated. On Windows, this is a problem because the
path is limited to 4k. There's no benefit in adding a path multiple
times, so prevent that from occuring. We also normalize the path
before checking for duplicates so things like /a and /a/ won't both
be stored.
Will backport.
........
r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines
time.strptime's caching of its locale object was being recreated when the
locale changed but not used during the function call it was recreated during.
The test in this checkin is untested (OS X does not have the proper locale
support for me to test), although the fix for the bug this deals with
was tested by the OP (#1290505). Once the buildbots verify the test at least
doesn't fail it becomes a backport candidate.
........
r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines
Fix the test for recreating the locale cache object by not worrying about if
one of the test locales cannot be set.
........
r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines
Fix a lot of markup and meta-information glitches.
........
r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines
Another fix.
........
r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines
Lots of explicit class names for method and member descs.
........
r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines
Explicit class names.
........
r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines
Some semantic fixes.
........
r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines
Remove bogus entry.
........
r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines
Fix the class name of strings.
........
r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line
SF #1693079: Cannot save empty array in shelve
........
r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines
Array module's buffer interface can now handle empty arrays.
........
r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines
Fix warnings about object.__init__() signature.
Two (test_array and test_descr) were bug IMO; the third (copy_reg)
is a work-around which recognizes that object.__init__() doesn't do
anything.
........
r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line
SF 1602378 Clarify docstrings for bisect
........
r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines
SF #1382213: Tutorial section 9.5.1 ignores MRO for new-style classes
........
r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines
- Fix an off-by-one bug in locale.strxfrm().
patch taken from http://bugs.debian.org/416934.
........
r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines
Fix the strange case of
\begin{methoddesc}[NNTP]{...}
where
\ifx#1\@undefined ended up comparing N and N, therefore executing
the true part of the conditional, blowing up at \@undefined.
........
r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines
Now using unittest for the tests infraestructure. Also split the
tests in those who need the network, and that who doesn't.
........
r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines
Move the functionality for catching warnings in test_warnings.py into a separate
class to that reusing the functionality in test_structmembers.py doesn't rerun
the tests from test_warnings.py.
........
r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines
Document that CatchWarningTests is reused by test_structmembers.py.
........
r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines
Add tests for the filename.
Test that the stacklevel is handled correctly.
........
r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines
Added a SSL server to test_socket_ssl.py to be able to test
locally. Now, it checks if have openssl available and run
those specific tests (it starts openssl at the beggining of
all the tests and then kills it at the end).
........
r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines
Implement a contextmanager test.test_support.catch_warning that can
be used to catch the last warning issued by the warning framework.
Change test_warnings.py and test_structmembers.py to use this
new contextmanager.
........
r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines
Changed the whole structure of startup and checking if the
server is available. Hope to not get more false alarms.
........
r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines
Fixed the way that the .pem files are looked for, and changed
how to kill the process in win32 to use the _handle attribute.
........
r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines
Fix a race condition in this test -- instead of assuming that it will take
the test server thread at most 0.5 seconds to get ready, use an event
variable.
........
r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line
Clean up imports.
........
r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line
Stop using test_support.verify().
........
r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines
Bug #1686475: Support stat'ing open files on Windows again.
Will backport to 2.5.
........
r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line
Make test_getopt use unittest.
........
r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line
Make test_softspace use unittest.
........
r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines
Fix WalkTests.test_traversal() on Windows. The cleanup in
MakedirTests.setUp() can now be removed.
........
r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines
Bug #1563759: struct.unpack doens't support buffer protocol objects
........
r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line
Convert test_long_future to use unittest.
........
r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line
Convert test_normalization to use unittest.
........
r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line
Some grammar fixes
........
r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_stringprep to use unittest.
........
r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line
Import cleanup in test_crypt.
........
r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_gc to use unittest.
........
r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_module to use unittest.
........
r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_fileinput to use unittest.
........
r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines
Doc that file.next() has undefined behaviour when called on a file opened with
'w'. Closes bug #1569057.
To be backported once 2.5 branch is unfrozen.
........
r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line
Added optional timeout to SocketHandler.makeSocket (SF #1695948)
........
r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines
Patch #1695862: remove old test directory that causes test_urllib failures
on Windows buildbots. The change is a one time fix and will be removed
after a successful buildbot run.
........
r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines
Minor fix to the tests pass ok even with -O.
........
r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line
Typo fix.
........
r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines
General clean-up. Lot of margin corrections, comments, some typos.
Exceptions now are raised in the new style. And a mockup class is
now also new style. Thanks Santiago Pereson.
........
r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines
Repair a duplicate label and some obsolete uses of \setindexsubitem.
........
r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line
Add window.chgat() method, submitted via e-mail by Fabian Kreutz
........
r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line
Point readers at the patch submission instructions
........
r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line
Describe undocumented third argument to touchline()
........
r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines
Add some missing NULL checks which trigger crashes on low-memory conditions.
Found by Victor Stinner. Will backport when 2.5 branch is unfrozen.
........
r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line
SF 1191699: Make slices picklable
........
r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines
Exceptions are no longer old-style instances. Fix accordingly.
........
r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines
Repair missing spaces after \UNIX.
........
r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line
SF 1193128: Let str.translate(None) be an identity transformation
........
r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines
Patch #1698951: clarify deprecation message in rexec and Bastion
........
r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines
Patch #1695862: remove the cleanup code, now that Windows buildbots are green
again.
........
r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines
Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the
first chunk fed to the decoder started with a BOM, but was longer than 3 bytes.
........
r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines
Port r54805 from python25-maint branch:
Add code to read from master_fd in the parent, breaking when we get an OSError
(EIO can occur on Linux) or there's no more data to read. Without this,
test_pty.py can hang on the waitpid() because the child is blocking on the
stdout write. This will definitely happen on Mac OS X and could potentially
happen on other platforms. See the comment for details.
........
r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line
Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127
........
r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line
Fix potential crash in path manipulation on windows
........
r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines
Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore'
is built before '_ctypes' is attempted.
Will backport to 2.5 once it is unfrozen for 2.5.1.
........
r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines
When __slots__ are set to a unicode string, make it work the same as
setting a plain string, ie don't expand to single letter identifiers.
........
r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line
SF #1701207, Fix bogus assertion (and test it!)
........
r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line
Check the availability of the urlfetch resource earlier than before.
........
r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines
Add Travis Oliphant.
........
r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines
Silence a compiler warning about incompatible pointer types.
........
r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines
SF #1703270, add missing declaration in readline.c to avoid compiler warning.
........
r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines
Revert r53997 as per
http://mail.python.org/pipermail/python-dev/2007-March/071796.html .
I've kept a couple of still-valid extra tests in test_descr, but didn't
bother to sort through the new comments and refactorings added in r53997
to see if some of them could be kept. If so, they could go in a
follow-up check-in.
........
r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines
Fix a usage of the dangerous pattern decref - modify field - incref.
........
r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines
Add an optional address to copy the failure mails to.
Detect a conflict in the only file that should have outstanding changes
when this script is run. This doesn't matter on the trunk, but does
when run on a branch. Trunk always has the date set to today in
boilerplate.tex. Each time a release is cut with a different date,
a conflict occurs. (We could copy a known good version, but then
we would lose changes to this file.)
........
r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines
Bug #1704790: bind name "sys" locally in __del__ method so that it is
not cleared before __del__ is run.
........
r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines
Added tests for other methods of SSL object. Now we cover
all the object methods. This is the final step to close
the #451607 bug.
........
r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines
As specified in RFC 2616, 2xx code indicates that the client's
request was successfully received, understood, and accepted.
Now in these cases no error is raised. Also fixed tests.
........
r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line
Convert PyUnit -> unittest.
........
r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line
Remove code that hasn't been called in years.
........
r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line
Fix SF #1703110, Incorrect example for add_password() (use uri, not host)
........
r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines
Some new year updates.
........
r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines
Added a comment about last change in urllib2.py (all 2xx responses
are ok now).
........
r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines
Bug #1705717: error in sys.argv docs.
........
r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines
Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file
(as opposed to the command line) will now write file names ending in
".cpp" too.
........
r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line
Fix markup
........
r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line
Merge change 54909 from release25-maint: Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition
........
r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line
Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h
........
r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line
Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now.
........
r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines
Patch #1698768: updated the "using Python on the Mac" intro.
........
r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines
Markup fix.
........
r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines
Whitespace normalization. Ugh, we really need to do this more often.
You might want to review this change as it's my first time. Be gentle. :-)
........
r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line
Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule().
........
r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line
Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing.
........
r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line
Change test_support.have_unicode to use True/False instead of 1/0.
........
r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines
Whitespace normalization.
........
r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines
Set missing svn:eol-style property on text files.
........
r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line
Import and raise statement cleanup.
........
r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line
Convert test_ossaudiodev to use unittest.
........
r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line
Fix an issue related to the unittest conversion.
........
r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line
fix some markup errors
........
r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line
Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode(). Use this function in posixmodule.c when implementing fdopen(). This fixes test_subprocess.py for a VisualStudio 2005 compile.
........
r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line
The locale "En" appears not to be valid on windows underi VisualStudio.2005. Added "English" to the test_locale.py to make the testsuite pass for that build
........
r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line
Minor wording change on slicing aide-memoire.
........
r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line
Accomodate 64 bit time_t in the _bsddb module.
........
2007-04-28 03:54:29 +08:00
|
|
|
raise self.error("command %s illegal in state %s, "
|
|
|
|
"only allowed in states %s" %
|
|
|
|
(name, self.state,
|
|
|
|
', '.join(Commands[name])))
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
for typ in ('OK', 'NO', 'BAD'):
|
2002-06-01 22:18:47 +08:00
|
|
|
if typ in self.untagged_responses:
|
2001-01-15 07:47:14 +08:00
|
|
|
del self.untagged_responses[typ]
|
1998-09-28 23:34:46 +08:00
|
|
|
|
2002-06-01 22:18:47 +08:00
|
|
|
if 'READ-ONLY' in self.untagged_responses \
|
2001-01-15 07:47:14 +08:00
|
|
|
and not self.is_readonly:
|
|
|
|
raise self.readonly('mailbox status changed to READ-ONLY')
|
1998-06-18 22:24:28 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
tag = self._new_tag()
|
2015-05-11 07:17:23 +08:00
|
|
|
name = bytes(name, self._encoding)
|
2008-11-06 03:39:50 +08:00
|
|
|
data = tag + b' ' + name
|
2001-01-15 07:47:14 +08:00
|
|
|
for arg in args:
|
|
|
|
if arg is None: continue
|
2008-11-06 03:39:50 +08:00
|
|
|
if isinstance(arg, str):
|
2015-05-11 07:17:23 +08:00
|
|
|
arg = bytes(arg, self._encoding)
|
2008-11-06 03:39:50 +08:00
|
|
|
data = data + b' ' + arg
|
1998-05-29 21:34:03 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
literal = self.literal
|
|
|
|
if literal is not None:
|
|
|
|
self.literal = None
|
|
|
|
if type(literal) is type(self._command):
|
|
|
|
literator = literal
|
|
|
|
else:
|
|
|
|
literator = None
|
2015-05-11 07:17:23 +08:00
|
|
|
data = data + bytes(' {%s}' % len(literal), self._encoding)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if __debug__:
|
|
|
|
if self.debug >= 4:
|
2008-11-06 03:39:50 +08:00
|
|
|
self._mesg('> %r' % data)
|
2001-01-15 07:47:14 +08:00
|
|
|
else:
|
2008-11-06 03:39:50 +08:00
|
|
|
self._log('> %r' % data)
|
1999-12-14 07:27:45 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
try:
|
2008-11-06 03:39:50 +08:00
|
|
|
self.send(data + CRLF)
|
2012-12-19 05:10:48 +08:00
|
|
|
except OSError as val:
|
2001-01-15 07:47:14 +08:00
|
|
|
raise self.abort('socket error: %s' % val)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if literal is None:
|
|
|
|
return tag
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
while 1:
|
|
|
|
# Wait for continuation response
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
while self._get_response():
|
|
|
|
if self.tagged_commands[tag]: # BAD/NO?
|
|
|
|
return tag
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Send literal
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if literator:
|
|
|
|
literal = literator(self.continuation_response)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if __debug__:
|
|
|
|
if self.debug >= 4:
|
2002-02-22 09:15:17 +08:00
|
|
|
self._mesg('write literal size %s' % len(literal))
|
1998-06-18 22:24:28 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
try:
|
2001-07-20 18:52:06 +08:00
|
|
|
self.send(literal)
|
|
|
|
self.send(CRLF)
|
2012-12-19 05:10:48 +08:00
|
|
|
except OSError as val:
|
2001-01-15 07:47:14 +08:00
|
|
|
raise self.abort('socket error: %s' % val)
|
1998-06-18 22:24:28 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if not literator:
|
|
|
|
break
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
return tag
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def _command_complete(self, name, tag):
|
2010-11-10 08:18:40 +08:00
|
|
|
# BYE is expected after LOGOUT
|
|
|
|
if name != 'LOGOUT':
|
|
|
|
self._check_bye()
|
2001-01-15 07:47:14 +08:00
|
|
|
try:
|
|
|
|
typ, data = self._get_tagged_response(tag)
|
2007-01-11 00:19:56 +08:00
|
|
|
except self.abort as val:
|
2001-01-15 07:47:14 +08:00
|
|
|
raise self.abort('command: %s => %s' % (name, val))
|
2007-01-11 00:19:56 +08:00
|
|
|
except self.error as val:
|
2001-01-15 07:47:14 +08:00
|
|
|
raise self.error('command: %s => %s' % (name, val))
|
2010-11-10 08:18:40 +08:00
|
|
|
if name != 'LOGOUT':
|
|
|
|
self._check_bye()
|
2001-01-15 07:47:14 +08:00
|
|
|
if typ == 'BAD':
|
|
|
|
raise self.error('%s command error: %s %s' % (name, typ, data))
|
|
|
|
return typ, data
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2010-11-17 01:55:26 +08:00
|
|
|
def _get_capabilities(self):
|
|
|
|
typ, dat = self.capability()
|
|
|
|
if dat == [None]:
|
|
|
|
raise self.error('no CAPABILITY response from server')
|
2015-05-11 07:17:23 +08:00
|
|
|
dat = str(dat[-1], self._encoding)
|
2010-11-17 01:55:26 +08:00
|
|
|
dat = dat.upper()
|
|
|
|
self.capabilities = tuple(dat.split())
|
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def _get_response(self):
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Read response and store.
|
|
|
|
#
|
|
|
|
# Returns None for continuation responses,
|
|
|
|
# otherwise first response line received.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
resp = self._get_line()
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Command completion response?
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if self._match(self.tagre, resp):
|
|
|
|
tag = self.mo.group('tag')
|
2002-06-01 22:18:47 +08:00
|
|
|
if not tag in self.tagged_commands:
|
2015-05-11 07:17:23 +08:00
|
|
|
raise self.abort('unexpected tagged response: %r' % resp)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
typ = self.mo.group('type')
|
2015-05-11 07:17:23 +08:00
|
|
|
typ = str(typ, self._encoding)
|
2001-01-15 07:47:14 +08:00
|
|
|
dat = self.mo.group('data')
|
|
|
|
self.tagged_commands[tag] = (typ, [dat])
|
|
|
|
else:
|
|
|
|
dat2 = None
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# '*' (untagged) responses?
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if not self._match(Untagged_response, resp):
|
2015-05-11 07:17:23 +08:00
|
|
|
if self._match(self.Untagged_status, resp):
|
2001-01-15 07:47:14 +08:00
|
|
|
dat2 = self.mo.group('data2')
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if self.mo is None:
|
|
|
|
# Only other possibility is '+' (continuation) response...
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if self._match(Continuation, resp):
|
|
|
|
self.continuation_response = self.mo.group('data')
|
|
|
|
return None # NB: indicates continuation
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2015-05-11 07:17:23 +08:00
|
|
|
raise self.abort("unexpected response: %r" % resp)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
typ = self.mo.group('type')
|
2015-05-11 07:17:23 +08:00
|
|
|
typ = str(typ, self._encoding)
|
2001-01-15 07:47:14 +08:00
|
|
|
dat = self.mo.group('data')
|
2008-11-06 03:39:50 +08:00
|
|
|
if dat is None: dat = b'' # Null untagged response
|
|
|
|
if dat2: dat = dat + b' ' + dat2
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Is there a literal to come?
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2015-05-11 07:17:23 +08:00
|
|
|
while self._match(self.Literal, dat):
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Read literal direct from connection.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-02-09 14:50:21 +08:00
|
|
|
size = int(self.mo.group('size'))
|
2001-01-15 07:47:14 +08:00
|
|
|
if __debug__:
|
|
|
|
if self.debug >= 4:
|
2002-02-22 09:15:17 +08:00
|
|
|
self._mesg('read literal size %s' % size)
|
2001-07-20 18:52:06 +08:00
|
|
|
data = self.read(size)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Store response with literal as tuple
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
self._append_untagged(typ, (dat, data))
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Read trailer - possibly containing another literal
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
dat = self._get_line()
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
self._append_untagged(typ, dat)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Bracketed response information?
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if typ in ('OK', 'NO', 'BAD') and self._match(Response_code, dat):
|
2008-11-06 03:39:50 +08:00
|
|
|
typ = self.mo.group('type')
|
2015-05-11 07:17:23 +08:00
|
|
|
typ = str(typ, self._encoding)
|
2008-11-06 03:39:50 +08:00
|
|
|
self._append_untagged(typ, self.mo.group('data'))
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
if __debug__:
|
|
|
|
if self.debug >= 1 and typ in ('NO', 'BAD', 'BYE'):
|
2008-11-06 03:39:50 +08:00
|
|
|
self._mesg('%s response: %r' % (typ, dat))
|
1998-09-28 23:34:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
return resp
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def _get_tagged_response(self, tag):
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
while 1:
|
|
|
|
result = self.tagged_commands[tag]
|
|
|
|
if result is not None:
|
|
|
|
del self.tagged_commands[tag]
|
|
|
|
return result
|
Patches by Piers Lauder.
Reasons for patches:
1st patch (15,21):
version change
2nd patch (66,72):
This is a patch I found in a Zope product release (quite by accident!).
It relaxes the conditions for matching a literal. I've looked over the
logic, and tested it, and it seems sensible.
3rd patch (117,123):
It appears the quoting matcher was too general, and that the IMAP4
protocol requires characters like ':' in commands to be unquoted.
(This is the patch already sent to Guido.)
4th patch (699,705):
Spelling correction in comment.
5th patch (753,761):
Another patch from the Zope product. It seems that some IMAP4 servers
produce unexpected responses in the middle of valid command/response
sequences. This patch ignores the unexpected responses in this
situation. (How I wish users would send me bug reports with examples!).
last 2 patches: (1015,1028) (1038,1044):
Minor improvements to test code.
2000-02-18 01:12:39 +08:00
|
|
|
|
2014-02-08 02:44:57 +08:00
|
|
|
# If we've seen a BYE at this point, the socket will be
|
|
|
|
# closed, so report the BYE now.
|
|
|
|
|
|
|
|
self._check_bye()
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Some have reported "unexpected response" exceptions.
|
|
|
|
# Note that ignoring them here causes loops.
|
|
|
|
# Instead, send me details of the unexpected response and
|
|
|
|
# I'll update the code in `_get_response()'.
|
Patches by Piers Lauder.
Reasons for patches:
1st patch (15,21):
version change
2nd patch (66,72):
This is a patch I found in a Zope product release (quite by accident!).
It relaxes the conditions for matching a literal. I've looked over the
logic, and tested it, and it seems sensible.
3rd patch (117,123):
It appears the quoting matcher was too general, and that the IMAP4
protocol requires characters like ':' in commands to be unquoted.
(This is the patch already sent to Guido.)
4th patch (699,705):
Spelling correction in comment.
5th patch (753,761):
Another patch from the Zope product. It seems that some IMAP4 servers
produce unexpected responses in the middle of valid command/response
sequences. This patch ignores the unexpected responses in this
situation. (How I wish users would send me bug reports with examples!).
last 2 patches: (1015,1028) (1038,1044):
Minor improvements to test code.
2000-02-18 01:12:39 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
try:
|
|
|
|
self._get_response()
|
2007-01-11 00:19:56 +08:00
|
|
|
except self.abort as val:
|
2001-01-15 07:47:14 +08:00
|
|
|
if __debug__:
|
|
|
|
if self.debug >= 1:
|
2002-02-22 09:15:17 +08:00
|
|
|
self.print_log()
|
2001-01-15 07:47:14 +08:00
|
|
|
raise
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def _get_line(self):
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-07-20 18:52:06 +08:00
|
|
|
line = self.readline()
|
2001-01-15 07:47:14 +08:00
|
|
|
if not line:
|
|
|
|
raise self.abort('socket error: EOF')
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Protocol mandates all lines terminated by CRLF
|
2009-12-10 10:08:06 +08:00
|
|
|
if not line.endswith(b'\r\n'):
|
2013-06-29 02:52:57 +08:00
|
|
|
raise self.abort('socket error: unterminated line: %r' % line)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
line = line[:-2]
|
|
|
|
if __debug__:
|
|
|
|
if self.debug >= 4:
|
2008-11-06 03:39:50 +08:00
|
|
|
self._mesg('< %r' % line)
|
2001-01-15 07:47:14 +08:00
|
|
|
else:
|
2008-11-06 03:39:50 +08:00
|
|
|
self._log('< %r' % line)
|
2001-01-15 07:47:14 +08:00
|
|
|
return line
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def _match(self, cre, s):
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# Run compiled regular expression match method on 's'.
|
|
|
|
# Save result, return success.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
self.mo = cre.match(s)
|
|
|
|
if __debug__:
|
|
|
|
if self.mo is not None and self.debug >= 5:
|
2008-11-06 03:39:50 +08:00
|
|
|
self._mesg("\tmatched r'%r' => %r" % (cre.pattern, self.mo.groups()))
|
2001-01-15 07:47:14 +08:00
|
|
|
return self.mo is not None
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def _new_tag(self):
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2015-05-11 07:17:23 +08:00
|
|
|
tag = self.tagpre + bytes(str(self.tagnum), self._encoding)
|
2001-01-15 07:47:14 +08:00
|
|
|
self.tagnum = self.tagnum + 1
|
|
|
|
self.tagged_commands[tag] = None
|
|
|
|
return tag
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def _quote(self, arg):
|
1999-12-14 07:27:45 +08:00
|
|
|
|
2010-11-10 06:55:55 +08:00
|
|
|
arg = arg.replace('\\', '\\\\')
|
|
|
|
arg = arg.replace('"', '\\"')
|
1999-12-14 07:27:45 +08:00
|
|
|
|
2010-11-10 06:55:55 +08:00
|
|
|
return '"' + arg + '"'
|
1999-12-14 07:27:45 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def _simple_command(self, name, *args):
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2003-02-28 04:14:51 +08:00
|
|
|
return self._command_complete(name, self._command(name, *args))
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
def _untagged_response(self, typ, dat, name):
|
|
|
|
if typ == 'NO':
|
|
|
|
return typ, dat
|
2002-06-01 22:18:47 +08:00
|
|
|
if not name in self.untagged_responses:
|
2001-01-15 07:47:14 +08:00
|
|
|
return typ, [None]
|
2002-06-30 11:39:14 +08:00
|
|
|
data = self.untagged_responses.pop(name)
|
2001-01-15 07:47:14 +08:00
|
|
|
if __debug__:
|
|
|
|
if self.debug >= 5:
|
2002-02-22 09:15:17 +08:00
|
|
|
self._mesg('untagged_responses[%s] => %s' % (name, data))
|
2001-01-15 07:47:14 +08:00
|
|
|
return typ, data
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
2002-02-22 09:15:17 +08:00
|
|
|
if __debug__:
|
|
|
|
|
|
|
|
def _mesg(self, s, secs=None):
|
|
|
|
if secs is None:
|
|
|
|
secs = time.time()
|
|
|
|
tm = time.strftime('%M:%S', time.localtime(secs))
|
|
|
|
sys.stderr.write(' %s.%02d %s\n' % (tm, (secs*100)%100, s))
|
|
|
|
sys.stderr.flush()
|
|
|
|
|
|
|
|
def _dump_ur(self, dict):
|
|
|
|
# Dump untagged responses (in `dict').
|
|
|
|
l = dict.items()
|
|
|
|
if not l: return
|
|
|
|
t = '\n\t\t'
|
|
|
|
l = map(lambda x:'%s: "%s"' % (x[0], x[1][0] and '" "'.join(x[1]) or ''), l)
|
|
|
|
self._mesg('untagged responses dump:%s%s' % (t, t.join(l)))
|
|
|
|
|
|
|
|
def _log(self, line):
|
|
|
|
# Keep log of last `_cmd_log_len' interactions for debugging.
|
|
|
|
self._cmd_log[self._cmd_log_idx] = (line, time.time())
|
|
|
|
self._cmd_log_idx += 1
|
|
|
|
if self._cmd_log_idx >= self._cmd_log_len:
|
|
|
|
self._cmd_log_idx = 0
|
|
|
|
|
|
|
|
def print_log(self):
|
|
|
|
self._mesg('last %d IMAP4 interactions:' % len(self._cmd_log))
|
|
|
|
i, n = self._cmd_log_idx, self._cmd_log_len
|
|
|
|
while n:
|
|
|
|
try:
|
2003-02-28 04:14:51 +08:00
|
|
|
self._mesg(*self._cmd_log[i])
|
2002-02-22 09:15:17 +08:00
|
|
|
except:
|
|
|
|
pass
|
|
|
|
i += 1
|
|
|
|
if i >= self._cmd_log_len:
|
|
|
|
i = 0
|
|
|
|
n -= 1
|
|
|
|
|
|
|
|
|
2010-11-13 02:49:16 +08:00
|
|
|
if HAVE_SSL:
|
1998-04-09 21:51:46 +08:00
|
|
|
|
Merged revisions 57620-57771 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57771 | thomas.wouters | 2007-08-30 23:54:39 +0200 (Thu, 30 Aug 2007) | 5 lines
Don't lie in __all__ attributes when SSL is not available: only add the SSL
classes when they are actually created.
........
r57620 | walter.doerwald | 2007-08-28 18:38:26 +0200 (Tue, 28 Aug 2007) | 5 lines
Fix title endtag in HTMLCalender.formatyearpage(). Fix documentation for
HTMLCalender.formatyearpage() (there's no themonth parameter).
This fixes issue1046.
........
r57622 | georg.brandl | 2007-08-28 20:54:44 +0200 (Tue, 28 Aug 2007) | 2 lines
Add a crasher for the thread-unsafety of file objects.
........
r57626 | skip.montanaro | 2007-08-29 01:22:52 +0200 (Wed, 29 Aug 2007) | 1 line
fixes 813986
........
r57628 | walter.doerwald | 2007-08-29 01:35:33 +0200 (Wed, 29 Aug 2007) | 2 lines
Fix test output.
........
r57631 | skip.montanaro | 2007-08-29 03:24:11 +0200 (Wed, 29 Aug 2007) | 2 lines
Install pygettext (once the scriptsinstall target is working again).
........
r57633 | skip.montanaro | 2007-08-29 03:33:45 +0200 (Wed, 29 Aug 2007) | 2 lines
Recent items.
........
r57650 | neal.norwitz | 2007-08-29 08:15:33 +0200 (Wed, 29 Aug 2007) | 1 line
Add Bill as a developer
........
r57651 | facundo.batista | 2007-08-29 12:28:28 +0200 (Wed, 29 Aug 2007) | 5 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised during FailingServerTestCase tests.
[GSoC - Alan McIntyre]
........
r57680 | bill.janssen | 2007-08-30 00:35:05 +0200 (Thu, 30 Aug 2007) | 17 lines
This contains a number of things:
1) Improve the documentation of the SSL module, with a fuller
explanation of certificate usage, another reference, proper
formatting of this and that.
2) Fix Windows bug in ssl.py, and general bug in sslsocket.close().
Remove some unused code from ssl.py. Allow accept() to be called on
sslsocket sockets.
3) Use try-except-else in import of ssl in socket.py. Deprecate use of
socket.ssl().
4) Remove use of socket.ssl() in every library module, except for
test_socket_ssl.py and test_ssl.py.
........
r57714 | georg.brandl | 2007-08-30 12:09:42 +0200 (Thu, 30 Aug 2007) | 2 lines
Stronger urge to convert filenames to str before using them as argument to ZipFile.write().
........
r57716 | georg.brandl | 2007-08-30 12:38:56 +0200 (Thu, 30 Aug 2007) | 2 lines
Patch #1680959: add test suite for pipes module.
........
r57717 | georg.brandl | 2007-08-30 14:32:23 +0200 (Thu, 30 Aug 2007) | 3 lines
* Skip test_pipes on non-POSIX.
* Don't raise TestSkipped within a test function.
........
r57723 | mark.summerfield | 2007-08-30 17:03:03 +0200 (Thu, 30 Aug 2007) | 3 lines
Added more cross-references.
........
r57726 | walter.doerwald | 2007-08-30 17:30:09 +0200 (Thu, 30 Aug 2007) | 2 lines
Rewrap line.
........
r57727 | walter.doerwald | 2007-08-30 17:34:55 +0200 (Thu, 30 Aug 2007) | 2 lines
Set startinpos before calling the error handler.
........
r57730 | bill.janssen | 2007-08-30 19:07:28 +0200 (Thu, 30 Aug 2007) | 3 lines
Added docstrings to methods and functions.
........
r57743 | bill.janssen | 2007-08-30 20:08:06 +0200 (Thu, 30 Aug 2007) | 1 line
added note on new ssl module and deprecation of socket.ssl
........
r57747 | martin.v.loewis | 2007-08-30 20:14:01 +0200 (Thu, 30 Aug 2007) | 1 line
Fix popen usage.
........
r57748 | martin.v.loewis | 2007-08-30 20:15:22 +0200 (Thu, 30 Aug 2007) | 1 line
Fix typo.
........
r57750 | martin.v.loewis | 2007-08-30 20:25:47 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1746880: Correctly install DLLs into system32 folder on Win64.
........
r57760 | martin.v.loewis | 2007-08-30 21:04:09 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1709599: Run test_1565150 only if the file system is NTFS.
........
r57762 | martin.v.loewis | 2007-08-30 22:10:57 +0200 (Thu, 30 Aug 2007) | 2 lines
Bump autoconf minimum version to 2.61.
........
r57764 | lars.gustaebel | 2007-08-30 22:24:31 +0200 (Thu, 30 Aug 2007) | 2 lines
Warn about possible risks when extracting untrusted archives.
........
r57769 | thomas.wouters | 2007-08-30 23:01:17 +0200 (Thu, 30 Aug 2007) | 7 lines
Somewhat-preliminary slice-object and extended slicing support for ctypes.
The exact behaviour of omitted and negative indices for the Pointer type may
need a closer look (especially as it's subtly different from simple slices)
but there's time yet before 2.6, and not enough before 3.0a1 :-)
........
2007-08-31 06:15:33 +08:00
|
|
|
class IMAP4_SSL(IMAP4):
|
2002-03-08 09:53:24 +08:00
|
|
|
|
Merged revisions 57620-57771 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57771 | thomas.wouters | 2007-08-30 23:54:39 +0200 (Thu, 30 Aug 2007) | 5 lines
Don't lie in __all__ attributes when SSL is not available: only add the SSL
classes when they are actually created.
........
r57620 | walter.doerwald | 2007-08-28 18:38:26 +0200 (Tue, 28 Aug 2007) | 5 lines
Fix title endtag in HTMLCalender.formatyearpage(). Fix documentation for
HTMLCalender.formatyearpage() (there's no themonth parameter).
This fixes issue1046.
........
r57622 | georg.brandl | 2007-08-28 20:54:44 +0200 (Tue, 28 Aug 2007) | 2 lines
Add a crasher for the thread-unsafety of file objects.
........
r57626 | skip.montanaro | 2007-08-29 01:22:52 +0200 (Wed, 29 Aug 2007) | 1 line
fixes 813986
........
r57628 | walter.doerwald | 2007-08-29 01:35:33 +0200 (Wed, 29 Aug 2007) | 2 lines
Fix test output.
........
r57631 | skip.montanaro | 2007-08-29 03:24:11 +0200 (Wed, 29 Aug 2007) | 2 lines
Install pygettext (once the scriptsinstall target is working again).
........
r57633 | skip.montanaro | 2007-08-29 03:33:45 +0200 (Wed, 29 Aug 2007) | 2 lines
Recent items.
........
r57650 | neal.norwitz | 2007-08-29 08:15:33 +0200 (Wed, 29 Aug 2007) | 1 line
Add Bill as a developer
........
r57651 | facundo.batista | 2007-08-29 12:28:28 +0200 (Wed, 29 Aug 2007) | 5 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised during FailingServerTestCase tests.
[GSoC - Alan McIntyre]
........
r57680 | bill.janssen | 2007-08-30 00:35:05 +0200 (Thu, 30 Aug 2007) | 17 lines
This contains a number of things:
1) Improve the documentation of the SSL module, with a fuller
explanation of certificate usage, another reference, proper
formatting of this and that.
2) Fix Windows bug in ssl.py, and general bug in sslsocket.close().
Remove some unused code from ssl.py. Allow accept() to be called on
sslsocket sockets.
3) Use try-except-else in import of ssl in socket.py. Deprecate use of
socket.ssl().
4) Remove use of socket.ssl() in every library module, except for
test_socket_ssl.py and test_ssl.py.
........
r57714 | georg.brandl | 2007-08-30 12:09:42 +0200 (Thu, 30 Aug 2007) | 2 lines
Stronger urge to convert filenames to str before using them as argument to ZipFile.write().
........
r57716 | georg.brandl | 2007-08-30 12:38:56 +0200 (Thu, 30 Aug 2007) | 2 lines
Patch #1680959: add test suite for pipes module.
........
r57717 | georg.brandl | 2007-08-30 14:32:23 +0200 (Thu, 30 Aug 2007) | 3 lines
* Skip test_pipes on non-POSIX.
* Don't raise TestSkipped within a test function.
........
r57723 | mark.summerfield | 2007-08-30 17:03:03 +0200 (Thu, 30 Aug 2007) | 3 lines
Added more cross-references.
........
r57726 | walter.doerwald | 2007-08-30 17:30:09 +0200 (Thu, 30 Aug 2007) | 2 lines
Rewrap line.
........
r57727 | walter.doerwald | 2007-08-30 17:34:55 +0200 (Thu, 30 Aug 2007) | 2 lines
Set startinpos before calling the error handler.
........
r57730 | bill.janssen | 2007-08-30 19:07:28 +0200 (Thu, 30 Aug 2007) | 3 lines
Added docstrings to methods and functions.
........
r57743 | bill.janssen | 2007-08-30 20:08:06 +0200 (Thu, 30 Aug 2007) | 1 line
added note on new ssl module and deprecation of socket.ssl
........
r57747 | martin.v.loewis | 2007-08-30 20:14:01 +0200 (Thu, 30 Aug 2007) | 1 line
Fix popen usage.
........
r57748 | martin.v.loewis | 2007-08-30 20:15:22 +0200 (Thu, 30 Aug 2007) | 1 line
Fix typo.
........
r57750 | martin.v.loewis | 2007-08-30 20:25:47 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1746880: Correctly install DLLs into system32 folder on Win64.
........
r57760 | martin.v.loewis | 2007-08-30 21:04:09 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1709599: Run test_1565150 only if the file system is NTFS.
........
r57762 | martin.v.loewis | 2007-08-30 22:10:57 +0200 (Thu, 30 Aug 2007) | 2 lines
Bump autoconf minimum version to 2.61.
........
r57764 | lars.gustaebel | 2007-08-30 22:24:31 +0200 (Thu, 30 Aug 2007) | 2 lines
Warn about possible risks when extracting untrusted archives.
........
r57769 | thomas.wouters | 2007-08-30 23:01:17 +0200 (Thu, 30 Aug 2007) | 7 lines
Somewhat-preliminary slice-object and extended slicing support for ctypes.
The exact behaviour of omitted and negative indices for the Pointer type may
need a closer look (especially as it's subtly different from simple slices)
but there's time yet before 2.6, and not enough before 3.0a1 :-)
........
2007-08-31 06:15:33 +08:00
|
|
|
"""IMAP4 client class over SSL connection
|
2002-03-08 09:53:24 +08:00
|
|
|
|
2011-05-07 00:49:52 +08:00
|
|
|
Instantiate with: IMAP4_SSL([host[, port[, keyfile[, certfile[, ssl_context]]]]])
|
2002-03-08 09:53:24 +08:00
|
|
|
|
Merged revisions 57620-57771 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57771 | thomas.wouters | 2007-08-30 23:54:39 +0200 (Thu, 30 Aug 2007) | 5 lines
Don't lie in __all__ attributes when SSL is not available: only add the SSL
classes when they are actually created.
........
r57620 | walter.doerwald | 2007-08-28 18:38:26 +0200 (Tue, 28 Aug 2007) | 5 lines
Fix title endtag in HTMLCalender.formatyearpage(). Fix documentation for
HTMLCalender.formatyearpage() (there's no themonth parameter).
This fixes issue1046.
........
r57622 | georg.brandl | 2007-08-28 20:54:44 +0200 (Tue, 28 Aug 2007) | 2 lines
Add a crasher for the thread-unsafety of file objects.
........
r57626 | skip.montanaro | 2007-08-29 01:22:52 +0200 (Wed, 29 Aug 2007) | 1 line
fixes 813986
........
r57628 | walter.doerwald | 2007-08-29 01:35:33 +0200 (Wed, 29 Aug 2007) | 2 lines
Fix test output.
........
r57631 | skip.montanaro | 2007-08-29 03:24:11 +0200 (Wed, 29 Aug 2007) | 2 lines
Install pygettext (once the scriptsinstall target is working again).
........
r57633 | skip.montanaro | 2007-08-29 03:33:45 +0200 (Wed, 29 Aug 2007) | 2 lines
Recent items.
........
r57650 | neal.norwitz | 2007-08-29 08:15:33 +0200 (Wed, 29 Aug 2007) | 1 line
Add Bill as a developer
........
r57651 | facundo.batista | 2007-08-29 12:28:28 +0200 (Wed, 29 Aug 2007) | 5 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised during FailingServerTestCase tests.
[GSoC - Alan McIntyre]
........
r57680 | bill.janssen | 2007-08-30 00:35:05 +0200 (Thu, 30 Aug 2007) | 17 lines
This contains a number of things:
1) Improve the documentation of the SSL module, with a fuller
explanation of certificate usage, another reference, proper
formatting of this and that.
2) Fix Windows bug in ssl.py, and general bug in sslsocket.close().
Remove some unused code from ssl.py. Allow accept() to be called on
sslsocket sockets.
3) Use try-except-else in import of ssl in socket.py. Deprecate use of
socket.ssl().
4) Remove use of socket.ssl() in every library module, except for
test_socket_ssl.py and test_ssl.py.
........
r57714 | georg.brandl | 2007-08-30 12:09:42 +0200 (Thu, 30 Aug 2007) | 2 lines
Stronger urge to convert filenames to str before using them as argument to ZipFile.write().
........
r57716 | georg.brandl | 2007-08-30 12:38:56 +0200 (Thu, 30 Aug 2007) | 2 lines
Patch #1680959: add test suite for pipes module.
........
r57717 | georg.brandl | 2007-08-30 14:32:23 +0200 (Thu, 30 Aug 2007) | 3 lines
* Skip test_pipes on non-POSIX.
* Don't raise TestSkipped within a test function.
........
r57723 | mark.summerfield | 2007-08-30 17:03:03 +0200 (Thu, 30 Aug 2007) | 3 lines
Added more cross-references.
........
r57726 | walter.doerwald | 2007-08-30 17:30:09 +0200 (Thu, 30 Aug 2007) | 2 lines
Rewrap line.
........
r57727 | walter.doerwald | 2007-08-30 17:34:55 +0200 (Thu, 30 Aug 2007) | 2 lines
Set startinpos before calling the error handler.
........
r57730 | bill.janssen | 2007-08-30 19:07:28 +0200 (Thu, 30 Aug 2007) | 3 lines
Added docstrings to methods and functions.
........
r57743 | bill.janssen | 2007-08-30 20:08:06 +0200 (Thu, 30 Aug 2007) | 1 line
added note on new ssl module and deprecation of socket.ssl
........
r57747 | martin.v.loewis | 2007-08-30 20:14:01 +0200 (Thu, 30 Aug 2007) | 1 line
Fix popen usage.
........
r57748 | martin.v.loewis | 2007-08-30 20:15:22 +0200 (Thu, 30 Aug 2007) | 1 line
Fix typo.
........
r57750 | martin.v.loewis | 2007-08-30 20:25:47 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1746880: Correctly install DLLs into system32 folder on Win64.
........
r57760 | martin.v.loewis | 2007-08-30 21:04:09 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1709599: Run test_1565150 only if the file system is NTFS.
........
r57762 | martin.v.loewis | 2007-08-30 22:10:57 +0200 (Thu, 30 Aug 2007) | 2 lines
Bump autoconf minimum version to 2.61.
........
r57764 | lars.gustaebel | 2007-08-30 22:24:31 +0200 (Thu, 30 Aug 2007) | 2 lines
Warn about possible risks when extracting untrusted archives.
........
r57769 | thomas.wouters | 2007-08-30 23:01:17 +0200 (Thu, 30 Aug 2007) | 7 lines
Somewhat-preliminary slice-object and extended slicing support for ctypes.
The exact behaviour of omitted and negative indices for the Pointer type may
need a closer look (especially as it's subtly different from simple slices)
but there's time yet before 2.6, and not enough before 3.0a1 :-)
........
2007-08-31 06:15:33 +08:00
|
|
|
host - host's name (default: localhost);
|
2011-05-07 00:49:52 +08:00
|
|
|
port - port number (default: standard IMAP4 SSL port);
|
Merged revisions 57620-57771 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57771 | thomas.wouters | 2007-08-30 23:54:39 +0200 (Thu, 30 Aug 2007) | 5 lines
Don't lie in __all__ attributes when SSL is not available: only add the SSL
classes when they are actually created.
........
r57620 | walter.doerwald | 2007-08-28 18:38:26 +0200 (Tue, 28 Aug 2007) | 5 lines
Fix title endtag in HTMLCalender.formatyearpage(). Fix documentation for
HTMLCalender.formatyearpage() (there's no themonth parameter).
This fixes issue1046.
........
r57622 | georg.brandl | 2007-08-28 20:54:44 +0200 (Tue, 28 Aug 2007) | 2 lines
Add a crasher for the thread-unsafety of file objects.
........
r57626 | skip.montanaro | 2007-08-29 01:22:52 +0200 (Wed, 29 Aug 2007) | 1 line
fixes 813986
........
r57628 | walter.doerwald | 2007-08-29 01:35:33 +0200 (Wed, 29 Aug 2007) | 2 lines
Fix test output.
........
r57631 | skip.montanaro | 2007-08-29 03:24:11 +0200 (Wed, 29 Aug 2007) | 2 lines
Install pygettext (once the scriptsinstall target is working again).
........
r57633 | skip.montanaro | 2007-08-29 03:33:45 +0200 (Wed, 29 Aug 2007) | 2 lines
Recent items.
........
r57650 | neal.norwitz | 2007-08-29 08:15:33 +0200 (Wed, 29 Aug 2007) | 1 line
Add Bill as a developer
........
r57651 | facundo.batista | 2007-08-29 12:28:28 +0200 (Wed, 29 Aug 2007) | 5 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised during FailingServerTestCase tests.
[GSoC - Alan McIntyre]
........
r57680 | bill.janssen | 2007-08-30 00:35:05 +0200 (Thu, 30 Aug 2007) | 17 lines
This contains a number of things:
1) Improve the documentation of the SSL module, with a fuller
explanation of certificate usage, another reference, proper
formatting of this and that.
2) Fix Windows bug in ssl.py, and general bug in sslsocket.close().
Remove some unused code from ssl.py. Allow accept() to be called on
sslsocket sockets.
3) Use try-except-else in import of ssl in socket.py. Deprecate use of
socket.ssl().
4) Remove use of socket.ssl() in every library module, except for
test_socket_ssl.py and test_ssl.py.
........
r57714 | georg.brandl | 2007-08-30 12:09:42 +0200 (Thu, 30 Aug 2007) | 2 lines
Stronger urge to convert filenames to str before using them as argument to ZipFile.write().
........
r57716 | georg.brandl | 2007-08-30 12:38:56 +0200 (Thu, 30 Aug 2007) | 2 lines
Patch #1680959: add test suite for pipes module.
........
r57717 | georg.brandl | 2007-08-30 14:32:23 +0200 (Thu, 30 Aug 2007) | 3 lines
* Skip test_pipes on non-POSIX.
* Don't raise TestSkipped within a test function.
........
r57723 | mark.summerfield | 2007-08-30 17:03:03 +0200 (Thu, 30 Aug 2007) | 3 lines
Added more cross-references.
........
r57726 | walter.doerwald | 2007-08-30 17:30:09 +0200 (Thu, 30 Aug 2007) | 2 lines
Rewrap line.
........
r57727 | walter.doerwald | 2007-08-30 17:34:55 +0200 (Thu, 30 Aug 2007) | 2 lines
Set startinpos before calling the error handler.
........
r57730 | bill.janssen | 2007-08-30 19:07:28 +0200 (Thu, 30 Aug 2007) | 3 lines
Added docstrings to methods and functions.
........
r57743 | bill.janssen | 2007-08-30 20:08:06 +0200 (Thu, 30 Aug 2007) | 1 line
added note on new ssl module and deprecation of socket.ssl
........
r57747 | martin.v.loewis | 2007-08-30 20:14:01 +0200 (Thu, 30 Aug 2007) | 1 line
Fix popen usage.
........
r57748 | martin.v.loewis | 2007-08-30 20:15:22 +0200 (Thu, 30 Aug 2007) | 1 line
Fix typo.
........
r57750 | martin.v.loewis | 2007-08-30 20:25:47 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1746880: Correctly install DLLs into system32 folder on Win64.
........
r57760 | martin.v.loewis | 2007-08-30 21:04:09 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1709599: Run test_1565150 only if the file system is NTFS.
........
r57762 | martin.v.loewis | 2007-08-30 22:10:57 +0200 (Thu, 30 Aug 2007) | 2 lines
Bump autoconf minimum version to 2.61.
........
r57764 | lars.gustaebel | 2007-08-30 22:24:31 +0200 (Thu, 30 Aug 2007) | 2 lines
Warn about possible risks when extracting untrusted archives.
........
r57769 | thomas.wouters | 2007-08-30 23:01:17 +0200 (Thu, 30 Aug 2007) | 7 lines
Somewhat-preliminary slice-object and extended slicing support for ctypes.
The exact behaviour of omitted and negative indices for the Pointer type may
need a closer look (especially as it's subtly different from simple slices)
but there's time yet before 2.6, and not enough before 3.0a1 :-)
........
2007-08-31 06:15:33 +08:00
|
|
|
keyfile - PEM formatted file that contains your private key (default: None);
|
|
|
|
certfile - PEM formatted certificate chain file (default: None);
|
2011-05-07 00:49:52 +08:00
|
|
|
ssl_context - a SSLContext object that contains your certificate chain
|
|
|
|
and private key (default: None)
|
|
|
|
Note: if ssl_context is provided, then parameters keyfile or
|
2012-12-19 03:26:36 +08:00
|
|
|
certfile should not be set otherwise ValueError is raised.
|
2002-03-08 09:53:24 +08:00
|
|
|
|
Merged revisions 57620-57771 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57771 | thomas.wouters | 2007-08-30 23:54:39 +0200 (Thu, 30 Aug 2007) | 5 lines
Don't lie in __all__ attributes when SSL is not available: only add the SSL
classes when they are actually created.
........
r57620 | walter.doerwald | 2007-08-28 18:38:26 +0200 (Tue, 28 Aug 2007) | 5 lines
Fix title endtag in HTMLCalender.formatyearpage(). Fix documentation for
HTMLCalender.formatyearpage() (there's no themonth parameter).
This fixes issue1046.
........
r57622 | georg.brandl | 2007-08-28 20:54:44 +0200 (Tue, 28 Aug 2007) | 2 lines
Add a crasher for the thread-unsafety of file objects.
........
r57626 | skip.montanaro | 2007-08-29 01:22:52 +0200 (Wed, 29 Aug 2007) | 1 line
fixes 813986
........
r57628 | walter.doerwald | 2007-08-29 01:35:33 +0200 (Wed, 29 Aug 2007) | 2 lines
Fix test output.
........
r57631 | skip.montanaro | 2007-08-29 03:24:11 +0200 (Wed, 29 Aug 2007) | 2 lines
Install pygettext (once the scriptsinstall target is working again).
........
r57633 | skip.montanaro | 2007-08-29 03:33:45 +0200 (Wed, 29 Aug 2007) | 2 lines
Recent items.
........
r57650 | neal.norwitz | 2007-08-29 08:15:33 +0200 (Wed, 29 Aug 2007) | 1 line
Add Bill as a developer
........
r57651 | facundo.batista | 2007-08-29 12:28:28 +0200 (Wed, 29 Aug 2007) | 5 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised during FailingServerTestCase tests.
[GSoC - Alan McIntyre]
........
r57680 | bill.janssen | 2007-08-30 00:35:05 +0200 (Thu, 30 Aug 2007) | 17 lines
This contains a number of things:
1) Improve the documentation of the SSL module, with a fuller
explanation of certificate usage, another reference, proper
formatting of this and that.
2) Fix Windows bug in ssl.py, and general bug in sslsocket.close().
Remove some unused code from ssl.py. Allow accept() to be called on
sslsocket sockets.
3) Use try-except-else in import of ssl in socket.py. Deprecate use of
socket.ssl().
4) Remove use of socket.ssl() in every library module, except for
test_socket_ssl.py and test_ssl.py.
........
r57714 | georg.brandl | 2007-08-30 12:09:42 +0200 (Thu, 30 Aug 2007) | 2 lines
Stronger urge to convert filenames to str before using them as argument to ZipFile.write().
........
r57716 | georg.brandl | 2007-08-30 12:38:56 +0200 (Thu, 30 Aug 2007) | 2 lines
Patch #1680959: add test suite for pipes module.
........
r57717 | georg.brandl | 2007-08-30 14:32:23 +0200 (Thu, 30 Aug 2007) | 3 lines
* Skip test_pipes on non-POSIX.
* Don't raise TestSkipped within a test function.
........
r57723 | mark.summerfield | 2007-08-30 17:03:03 +0200 (Thu, 30 Aug 2007) | 3 lines
Added more cross-references.
........
r57726 | walter.doerwald | 2007-08-30 17:30:09 +0200 (Thu, 30 Aug 2007) | 2 lines
Rewrap line.
........
r57727 | walter.doerwald | 2007-08-30 17:34:55 +0200 (Thu, 30 Aug 2007) | 2 lines
Set startinpos before calling the error handler.
........
r57730 | bill.janssen | 2007-08-30 19:07:28 +0200 (Thu, 30 Aug 2007) | 3 lines
Added docstrings to methods and functions.
........
r57743 | bill.janssen | 2007-08-30 20:08:06 +0200 (Thu, 30 Aug 2007) | 1 line
added note on new ssl module and deprecation of socket.ssl
........
r57747 | martin.v.loewis | 2007-08-30 20:14:01 +0200 (Thu, 30 Aug 2007) | 1 line
Fix popen usage.
........
r57748 | martin.v.loewis | 2007-08-30 20:15:22 +0200 (Thu, 30 Aug 2007) | 1 line
Fix typo.
........
r57750 | martin.v.loewis | 2007-08-30 20:25:47 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1746880: Correctly install DLLs into system32 folder on Win64.
........
r57760 | martin.v.loewis | 2007-08-30 21:04:09 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1709599: Run test_1565150 only if the file system is NTFS.
........
r57762 | martin.v.loewis | 2007-08-30 22:10:57 +0200 (Thu, 30 Aug 2007) | 2 lines
Bump autoconf minimum version to 2.61.
........
r57764 | lars.gustaebel | 2007-08-30 22:24:31 +0200 (Thu, 30 Aug 2007) | 2 lines
Warn about possible risks when extracting untrusted archives.
........
r57769 | thomas.wouters | 2007-08-30 23:01:17 +0200 (Thu, 30 Aug 2007) | 7 lines
Somewhat-preliminary slice-object and extended slicing support for ctypes.
The exact behaviour of omitted and negative indices for the Pointer type may
need a closer look (especially as it's subtly different from simple slices)
but there's time yet before 2.6, and not enough before 3.0a1 :-)
........
2007-08-31 06:15:33 +08:00
|
|
|
for more documentation see the docstring of the parent class IMAP4.
|
|
|
|
"""
|
2002-03-08 09:53:24 +08:00
|
|
|
|
|
|
|
|
2015-05-11 07:17:23 +08:00
|
|
|
def __init__(self, host='', port=IMAP4_SSL_PORT, keyfile=None,
|
|
|
|
certfile=None, ssl_context=None):
|
2011-05-07 00:49:52 +08:00
|
|
|
if ssl_context is not None and keyfile is not None:
|
|
|
|
raise ValueError("ssl_context and keyfile arguments are mutually "
|
|
|
|
"exclusive")
|
|
|
|
if ssl_context is not None and certfile is not None:
|
|
|
|
raise ValueError("ssl_context and certfile arguments are mutually "
|
|
|
|
"exclusive")
|
|
|
|
|
Merged revisions 57620-57771 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57771 | thomas.wouters | 2007-08-30 23:54:39 +0200 (Thu, 30 Aug 2007) | 5 lines
Don't lie in __all__ attributes when SSL is not available: only add the SSL
classes when they are actually created.
........
r57620 | walter.doerwald | 2007-08-28 18:38:26 +0200 (Tue, 28 Aug 2007) | 5 lines
Fix title endtag in HTMLCalender.formatyearpage(). Fix documentation for
HTMLCalender.formatyearpage() (there's no themonth parameter).
This fixes issue1046.
........
r57622 | georg.brandl | 2007-08-28 20:54:44 +0200 (Tue, 28 Aug 2007) | 2 lines
Add a crasher for the thread-unsafety of file objects.
........
r57626 | skip.montanaro | 2007-08-29 01:22:52 +0200 (Wed, 29 Aug 2007) | 1 line
fixes 813986
........
r57628 | walter.doerwald | 2007-08-29 01:35:33 +0200 (Wed, 29 Aug 2007) | 2 lines
Fix test output.
........
r57631 | skip.montanaro | 2007-08-29 03:24:11 +0200 (Wed, 29 Aug 2007) | 2 lines
Install pygettext (once the scriptsinstall target is working again).
........
r57633 | skip.montanaro | 2007-08-29 03:33:45 +0200 (Wed, 29 Aug 2007) | 2 lines
Recent items.
........
r57650 | neal.norwitz | 2007-08-29 08:15:33 +0200 (Wed, 29 Aug 2007) | 1 line
Add Bill as a developer
........
r57651 | facundo.batista | 2007-08-29 12:28:28 +0200 (Wed, 29 Aug 2007) | 5 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised during FailingServerTestCase tests.
[GSoC - Alan McIntyre]
........
r57680 | bill.janssen | 2007-08-30 00:35:05 +0200 (Thu, 30 Aug 2007) | 17 lines
This contains a number of things:
1) Improve the documentation of the SSL module, with a fuller
explanation of certificate usage, another reference, proper
formatting of this and that.
2) Fix Windows bug in ssl.py, and general bug in sslsocket.close().
Remove some unused code from ssl.py. Allow accept() to be called on
sslsocket sockets.
3) Use try-except-else in import of ssl in socket.py. Deprecate use of
socket.ssl().
4) Remove use of socket.ssl() in every library module, except for
test_socket_ssl.py and test_ssl.py.
........
r57714 | georg.brandl | 2007-08-30 12:09:42 +0200 (Thu, 30 Aug 2007) | 2 lines
Stronger urge to convert filenames to str before using them as argument to ZipFile.write().
........
r57716 | georg.brandl | 2007-08-30 12:38:56 +0200 (Thu, 30 Aug 2007) | 2 lines
Patch #1680959: add test suite for pipes module.
........
r57717 | georg.brandl | 2007-08-30 14:32:23 +0200 (Thu, 30 Aug 2007) | 3 lines
* Skip test_pipes on non-POSIX.
* Don't raise TestSkipped within a test function.
........
r57723 | mark.summerfield | 2007-08-30 17:03:03 +0200 (Thu, 30 Aug 2007) | 3 lines
Added more cross-references.
........
r57726 | walter.doerwald | 2007-08-30 17:30:09 +0200 (Thu, 30 Aug 2007) | 2 lines
Rewrap line.
........
r57727 | walter.doerwald | 2007-08-30 17:34:55 +0200 (Thu, 30 Aug 2007) | 2 lines
Set startinpos before calling the error handler.
........
r57730 | bill.janssen | 2007-08-30 19:07:28 +0200 (Thu, 30 Aug 2007) | 3 lines
Added docstrings to methods and functions.
........
r57743 | bill.janssen | 2007-08-30 20:08:06 +0200 (Thu, 30 Aug 2007) | 1 line
added note on new ssl module and deprecation of socket.ssl
........
r57747 | martin.v.loewis | 2007-08-30 20:14:01 +0200 (Thu, 30 Aug 2007) | 1 line
Fix popen usage.
........
r57748 | martin.v.loewis | 2007-08-30 20:15:22 +0200 (Thu, 30 Aug 2007) | 1 line
Fix typo.
........
r57750 | martin.v.loewis | 2007-08-30 20:25:47 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1746880: Correctly install DLLs into system32 folder on Win64.
........
r57760 | martin.v.loewis | 2007-08-30 21:04:09 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1709599: Run test_1565150 only if the file system is NTFS.
........
r57762 | martin.v.loewis | 2007-08-30 22:10:57 +0200 (Thu, 30 Aug 2007) | 2 lines
Bump autoconf minimum version to 2.61.
........
r57764 | lars.gustaebel | 2007-08-30 22:24:31 +0200 (Thu, 30 Aug 2007) | 2 lines
Warn about possible risks when extracting untrusted archives.
........
r57769 | thomas.wouters | 2007-08-30 23:01:17 +0200 (Thu, 30 Aug 2007) | 7 lines
Somewhat-preliminary slice-object and extended slicing support for ctypes.
The exact behaviour of omitted and negative indices for the Pointer type may
need a closer look (especially as it's subtly different from simple slices)
but there's time yet before 2.6, and not enough before 3.0a1 :-)
........
2007-08-31 06:15:33 +08:00
|
|
|
self.keyfile = keyfile
|
|
|
|
self.certfile = certfile
|
2013-11-24 05:43:47 +08:00
|
|
|
if ssl_context is None:
|
|
|
|
ssl_context = ssl._create_stdlib_context(certfile=certfile,
|
|
|
|
keyfile=keyfile)
|
2011-05-07 00:49:52 +08:00
|
|
|
self.ssl_context = ssl_context
|
Merged revisions 57620-57771 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57771 | thomas.wouters | 2007-08-30 23:54:39 +0200 (Thu, 30 Aug 2007) | 5 lines
Don't lie in __all__ attributes when SSL is not available: only add the SSL
classes when they are actually created.
........
r57620 | walter.doerwald | 2007-08-28 18:38:26 +0200 (Tue, 28 Aug 2007) | 5 lines
Fix title endtag in HTMLCalender.formatyearpage(). Fix documentation for
HTMLCalender.formatyearpage() (there's no themonth parameter).
This fixes issue1046.
........
r57622 | georg.brandl | 2007-08-28 20:54:44 +0200 (Tue, 28 Aug 2007) | 2 lines
Add a crasher for the thread-unsafety of file objects.
........
r57626 | skip.montanaro | 2007-08-29 01:22:52 +0200 (Wed, 29 Aug 2007) | 1 line
fixes 813986
........
r57628 | walter.doerwald | 2007-08-29 01:35:33 +0200 (Wed, 29 Aug 2007) | 2 lines
Fix test output.
........
r57631 | skip.montanaro | 2007-08-29 03:24:11 +0200 (Wed, 29 Aug 2007) | 2 lines
Install pygettext (once the scriptsinstall target is working again).
........
r57633 | skip.montanaro | 2007-08-29 03:33:45 +0200 (Wed, 29 Aug 2007) | 2 lines
Recent items.
........
r57650 | neal.norwitz | 2007-08-29 08:15:33 +0200 (Wed, 29 Aug 2007) | 1 line
Add Bill as a developer
........
r57651 | facundo.batista | 2007-08-29 12:28:28 +0200 (Wed, 29 Aug 2007) | 5 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised during FailingServerTestCase tests.
[GSoC - Alan McIntyre]
........
r57680 | bill.janssen | 2007-08-30 00:35:05 +0200 (Thu, 30 Aug 2007) | 17 lines
This contains a number of things:
1) Improve the documentation of the SSL module, with a fuller
explanation of certificate usage, another reference, proper
formatting of this and that.
2) Fix Windows bug in ssl.py, and general bug in sslsocket.close().
Remove some unused code from ssl.py. Allow accept() to be called on
sslsocket sockets.
3) Use try-except-else in import of ssl in socket.py. Deprecate use of
socket.ssl().
4) Remove use of socket.ssl() in every library module, except for
test_socket_ssl.py and test_ssl.py.
........
r57714 | georg.brandl | 2007-08-30 12:09:42 +0200 (Thu, 30 Aug 2007) | 2 lines
Stronger urge to convert filenames to str before using them as argument to ZipFile.write().
........
r57716 | georg.brandl | 2007-08-30 12:38:56 +0200 (Thu, 30 Aug 2007) | 2 lines
Patch #1680959: add test suite for pipes module.
........
r57717 | georg.brandl | 2007-08-30 14:32:23 +0200 (Thu, 30 Aug 2007) | 3 lines
* Skip test_pipes on non-POSIX.
* Don't raise TestSkipped within a test function.
........
r57723 | mark.summerfield | 2007-08-30 17:03:03 +0200 (Thu, 30 Aug 2007) | 3 lines
Added more cross-references.
........
r57726 | walter.doerwald | 2007-08-30 17:30:09 +0200 (Thu, 30 Aug 2007) | 2 lines
Rewrap line.
........
r57727 | walter.doerwald | 2007-08-30 17:34:55 +0200 (Thu, 30 Aug 2007) | 2 lines
Set startinpos before calling the error handler.
........
r57730 | bill.janssen | 2007-08-30 19:07:28 +0200 (Thu, 30 Aug 2007) | 3 lines
Added docstrings to methods and functions.
........
r57743 | bill.janssen | 2007-08-30 20:08:06 +0200 (Thu, 30 Aug 2007) | 1 line
added note on new ssl module and deprecation of socket.ssl
........
r57747 | martin.v.loewis | 2007-08-30 20:14:01 +0200 (Thu, 30 Aug 2007) | 1 line
Fix popen usage.
........
r57748 | martin.v.loewis | 2007-08-30 20:15:22 +0200 (Thu, 30 Aug 2007) | 1 line
Fix typo.
........
r57750 | martin.v.loewis | 2007-08-30 20:25:47 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1746880: Correctly install DLLs into system32 folder on Win64.
........
r57760 | martin.v.loewis | 2007-08-30 21:04:09 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1709599: Run test_1565150 only if the file system is NTFS.
........
r57762 | martin.v.loewis | 2007-08-30 22:10:57 +0200 (Thu, 30 Aug 2007) | 2 lines
Bump autoconf minimum version to 2.61.
........
r57764 | lars.gustaebel | 2007-08-30 22:24:31 +0200 (Thu, 30 Aug 2007) | 2 lines
Warn about possible risks when extracting untrusted archives.
........
r57769 | thomas.wouters | 2007-08-30 23:01:17 +0200 (Thu, 30 Aug 2007) | 7 lines
Somewhat-preliminary slice-object and extended slicing support for ctypes.
The exact behaviour of omitted and negative indices for the Pointer type may
need a closer look (especially as it's subtly different from simple slices)
but there's time yet before 2.6, and not enough before 3.0a1 :-)
........
2007-08-31 06:15:33 +08:00
|
|
|
IMAP4.__init__(self, host, port)
|
2002-03-08 09:53:24 +08:00
|
|
|
|
2008-11-06 03:39:50 +08:00
|
|
|
def _create_socket(self):
|
|
|
|
sock = IMAP4._create_socket(self)
|
2013-12-03 03:01:29 +08:00
|
|
|
return self.ssl_context.wrap_socket(sock,
|
2014-11-24 07:04:34 +08:00
|
|
|
server_hostname=self.host)
|
2002-03-08 09:53:24 +08:00
|
|
|
|
2008-11-06 03:39:50 +08:00
|
|
|
def open(self, host='', port=IMAP4_SSL_PORT):
|
Merged revisions 57620-57771 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57771 | thomas.wouters | 2007-08-30 23:54:39 +0200 (Thu, 30 Aug 2007) | 5 lines
Don't lie in __all__ attributes when SSL is not available: only add the SSL
classes when they are actually created.
........
r57620 | walter.doerwald | 2007-08-28 18:38:26 +0200 (Tue, 28 Aug 2007) | 5 lines
Fix title endtag in HTMLCalender.formatyearpage(). Fix documentation for
HTMLCalender.formatyearpage() (there's no themonth parameter).
This fixes issue1046.
........
r57622 | georg.brandl | 2007-08-28 20:54:44 +0200 (Tue, 28 Aug 2007) | 2 lines
Add a crasher for the thread-unsafety of file objects.
........
r57626 | skip.montanaro | 2007-08-29 01:22:52 +0200 (Wed, 29 Aug 2007) | 1 line
fixes 813986
........
r57628 | walter.doerwald | 2007-08-29 01:35:33 +0200 (Wed, 29 Aug 2007) | 2 lines
Fix test output.
........
r57631 | skip.montanaro | 2007-08-29 03:24:11 +0200 (Wed, 29 Aug 2007) | 2 lines
Install pygettext (once the scriptsinstall target is working again).
........
r57633 | skip.montanaro | 2007-08-29 03:33:45 +0200 (Wed, 29 Aug 2007) | 2 lines
Recent items.
........
r57650 | neal.norwitz | 2007-08-29 08:15:33 +0200 (Wed, 29 Aug 2007) | 1 line
Add Bill as a developer
........
r57651 | facundo.batista | 2007-08-29 12:28:28 +0200 (Wed, 29 Aug 2007) | 5 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised during FailingServerTestCase tests.
[GSoC - Alan McIntyre]
........
r57680 | bill.janssen | 2007-08-30 00:35:05 +0200 (Thu, 30 Aug 2007) | 17 lines
This contains a number of things:
1) Improve the documentation of the SSL module, with a fuller
explanation of certificate usage, another reference, proper
formatting of this and that.
2) Fix Windows bug in ssl.py, and general bug in sslsocket.close().
Remove some unused code from ssl.py. Allow accept() to be called on
sslsocket sockets.
3) Use try-except-else in import of ssl in socket.py. Deprecate use of
socket.ssl().
4) Remove use of socket.ssl() in every library module, except for
test_socket_ssl.py and test_ssl.py.
........
r57714 | georg.brandl | 2007-08-30 12:09:42 +0200 (Thu, 30 Aug 2007) | 2 lines
Stronger urge to convert filenames to str before using them as argument to ZipFile.write().
........
r57716 | georg.brandl | 2007-08-30 12:38:56 +0200 (Thu, 30 Aug 2007) | 2 lines
Patch #1680959: add test suite for pipes module.
........
r57717 | georg.brandl | 2007-08-30 14:32:23 +0200 (Thu, 30 Aug 2007) | 3 lines
* Skip test_pipes on non-POSIX.
* Don't raise TestSkipped within a test function.
........
r57723 | mark.summerfield | 2007-08-30 17:03:03 +0200 (Thu, 30 Aug 2007) | 3 lines
Added more cross-references.
........
r57726 | walter.doerwald | 2007-08-30 17:30:09 +0200 (Thu, 30 Aug 2007) | 2 lines
Rewrap line.
........
r57727 | walter.doerwald | 2007-08-30 17:34:55 +0200 (Thu, 30 Aug 2007) | 2 lines
Set startinpos before calling the error handler.
........
r57730 | bill.janssen | 2007-08-30 19:07:28 +0200 (Thu, 30 Aug 2007) | 3 lines
Added docstrings to methods and functions.
........
r57743 | bill.janssen | 2007-08-30 20:08:06 +0200 (Thu, 30 Aug 2007) | 1 line
added note on new ssl module and deprecation of socket.ssl
........
r57747 | martin.v.loewis | 2007-08-30 20:14:01 +0200 (Thu, 30 Aug 2007) | 1 line
Fix popen usage.
........
r57748 | martin.v.loewis | 2007-08-30 20:15:22 +0200 (Thu, 30 Aug 2007) | 1 line
Fix typo.
........
r57750 | martin.v.loewis | 2007-08-30 20:25:47 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1746880: Correctly install DLLs into system32 folder on Win64.
........
r57760 | martin.v.loewis | 2007-08-30 21:04:09 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1709599: Run test_1565150 only if the file system is NTFS.
........
r57762 | martin.v.loewis | 2007-08-30 22:10:57 +0200 (Thu, 30 Aug 2007) | 2 lines
Bump autoconf minimum version to 2.61.
........
r57764 | lars.gustaebel | 2007-08-30 22:24:31 +0200 (Thu, 30 Aug 2007) | 2 lines
Warn about possible risks when extracting untrusted archives.
........
r57769 | thomas.wouters | 2007-08-30 23:01:17 +0200 (Thu, 30 Aug 2007) | 7 lines
Somewhat-preliminary slice-object and extended slicing support for ctypes.
The exact behaviour of omitted and negative indices for the Pointer type may
need a closer look (especially as it's subtly different from simple slices)
but there's time yet before 2.6, and not enough before 3.0a1 :-)
........
2007-08-31 06:15:33 +08:00
|
|
|
"""Setup connection to remote server on "host:port".
|
|
|
|
(default: localhost:standard IMAP4 SSL port).
|
|
|
|
This connection will be used by the routines:
|
|
|
|
read, readline, send, shutdown.
|
|
|
|
"""
|
2008-11-06 03:39:50 +08:00
|
|
|
IMAP4.open(self, host, port)
|
2002-03-08 09:53:24 +08:00
|
|
|
|
Merged revisions 57620-57771 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57771 | thomas.wouters | 2007-08-30 23:54:39 +0200 (Thu, 30 Aug 2007) | 5 lines
Don't lie in __all__ attributes when SSL is not available: only add the SSL
classes when they are actually created.
........
r57620 | walter.doerwald | 2007-08-28 18:38:26 +0200 (Tue, 28 Aug 2007) | 5 lines
Fix title endtag in HTMLCalender.formatyearpage(). Fix documentation for
HTMLCalender.formatyearpage() (there's no themonth parameter).
This fixes issue1046.
........
r57622 | georg.brandl | 2007-08-28 20:54:44 +0200 (Tue, 28 Aug 2007) | 2 lines
Add a crasher for the thread-unsafety of file objects.
........
r57626 | skip.montanaro | 2007-08-29 01:22:52 +0200 (Wed, 29 Aug 2007) | 1 line
fixes 813986
........
r57628 | walter.doerwald | 2007-08-29 01:35:33 +0200 (Wed, 29 Aug 2007) | 2 lines
Fix test output.
........
r57631 | skip.montanaro | 2007-08-29 03:24:11 +0200 (Wed, 29 Aug 2007) | 2 lines
Install pygettext (once the scriptsinstall target is working again).
........
r57633 | skip.montanaro | 2007-08-29 03:33:45 +0200 (Wed, 29 Aug 2007) | 2 lines
Recent items.
........
r57650 | neal.norwitz | 2007-08-29 08:15:33 +0200 (Wed, 29 Aug 2007) | 1 line
Add Bill as a developer
........
r57651 | facundo.batista | 2007-08-29 12:28:28 +0200 (Wed, 29 Aug 2007) | 5 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised during FailingServerTestCase tests.
[GSoC - Alan McIntyre]
........
r57680 | bill.janssen | 2007-08-30 00:35:05 +0200 (Thu, 30 Aug 2007) | 17 lines
This contains a number of things:
1) Improve the documentation of the SSL module, with a fuller
explanation of certificate usage, another reference, proper
formatting of this and that.
2) Fix Windows bug in ssl.py, and general bug in sslsocket.close().
Remove some unused code from ssl.py. Allow accept() to be called on
sslsocket sockets.
3) Use try-except-else in import of ssl in socket.py. Deprecate use of
socket.ssl().
4) Remove use of socket.ssl() in every library module, except for
test_socket_ssl.py and test_ssl.py.
........
r57714 | georg.brandl | 2007-08-30 12:09:42 +0200 (Thu, 30 Aug 2007) | 2 lines
Stronger urge to convert filenames to str before using them as argument to ZipFile.write().
........
r57716 | georg.brandl | 2007-08-30 12:38:56 +0200 (Thu, 30 Aug 2007) | 2 lines
Patch #1680959: add test suite for pipes module.
........
r57717 | georg.brandl | 2007-08-30 14:32:23 +0200 (Thu, 30 Aug 2007) | 3 lines
* Skip test_pipes on non-POSIX.
* Don't raise TestSkipped within a test function.
........
r57723 | mark.summerfield | 2007-08-30 17:03:03 +0200 (Thu, 30 Aug 2007) | 3 lines
Added more cross-references.
........
r57726 | walter.doerwald | 2007-08-30 17:30:09 +0200 (Thu, 30 Aug 2007) | 2 lines
Rewrap line.
........
r57727 | walter.doerwald | 2007-08-30 17:34:55 +0200 (Thu, 30 Aug 2007) | 2 lines
Set startinpos before calling the error handler.
........
r57730 | bill.janssen | 2007-08-30 19:07:28 +0200 (Thu, 30 Aug 2007) | 3 lines
Added docstrings to methods and functions.
........
r57743 | bill.janssen | 2007-08-30 20:08:06 +0200 (Thu, 30 Aug 2007) | 1 line
added note on new ssl module and deprecation of socket.ssl
........
r57747 | martin.v.loewis | 2007-08-30 20:14:01 +0200 (Thu, 30 Aug 2007) | 1 line
Fix popen usage.
........
r57748 | martin.v.loewis | 2007-08-30 20:15:22 +0200 (Thu, 30 Aug 2007) | 1 line
Fix typo.
........
r57750 | martin.v.loewis | 2007-08-30 20:25:47 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1746880: Correctly install DLLs into system32 folder on Win64.
........
r57760 | martin.v.loewis | 2007-08-30 21:04:09 +0200 (Thu, 30 Aug 2007) | 1 line
Bug #1709599: Run test_1565150 only if the file system is NTFS.
........
r57762 | martin.v.loewis | 2007-08-30 22:10:57 +0200 (Thu, 30 Aug 2007) | 2 lines
Bump autoconf minimum version to 2.61.
........
r57764 | lars.gustaebel | 2007-08-30 22:24:31 +0200 (Thu, 30 Aug 2007) | 2 lines
Warn about possible risks when extracting untrusted archives.
........
r57769 | thomas.wouters | 2007-08-30 23:01:17 +0200 (Thu, 30 Aug 2007) | 7 lines
Somewhat-preliminary slice-object and extended slicing support for ctypes.
The exact behaviour of omitted and negative indices for the Pointer type may
need a closer look (especially as it's subtly different from simple slices)
but there's time yet before 2.6, and not enough before 3.0a1 :-)
........
2007-08-31 06:15:33 +08:00
|
|
|
__all__.append("IMAP4_SSL")
|
2002-03-08 09:53:24 +08:00
|
|
|
|
|
|
|
|
2002-11-22 13:53:04 +08:00
|
|
|
class IMAP4_stream(IMAP4):
|
|
|
|
|
|
|
|
"""IMAP4 client class over a stream
|
|
|
|
|
|
|
|
Instantiate with: IMAP4_stream(command)
|
|
|
|
|
2015-05-11 07:17:23 +08:00
|
|
|
"command" - a string that can be passed to subprocess.Popen()
|
2002-11-22 13:53:04 +08:00
|
|
|
|
|
|
|
for more documentation see the docstring of the parent class IMAP4.
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, command):
|
|
|
|
self.command = command
|
|
|
|
IMAP4.__init__(self)
|
|
|
|
|
|
|
|
|
|
|
|
def open(self, host = None, port = None):
|
|
|
|
"""Setup a stream connection.
|
|
|
|
This connection will be used by the routines:
|
|
|
|
read, readline, send, shutdown.
|
|
|
|
"""
|
|
|
|
self.host = None # For compatibility with parent class
|
|
|
|
self.port = None
|
|
|
|
self.sock = None
|
|
|
|
self.file = None
|
2008-11-06 03:39:50 +08:00
|
|
|
self.process = subprocess.Popen(self.command,
|
2013-03-20 01:52:33 +08:00
|
|
|
bufsize=DEFAULT_BUFFER_SIZE,
|
2008-11-06 03:39:50 +08:00
|
|
|
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
|
|
|
|
shell=True, close_fds=True)
|
|
|
|
self.writefile = self.process.stdin
|
|
|
|
self.readfile = self.process.stdout
|
2002-11-22 13:53:04 +08:00
|
|
|
|
|
|
|
def read(self, size):
|
|
|
|
"""Read 'size' bytes from remote."""
|
|
|
|
return self.readfile.read(size)
|
|
|
|
|
|
|
|
|
|
|
|
def readline(self):
|
|
|
|
"""Read line from remote."""
|
|
|
|
return self.readfile.readline()
|
|
|
|
|
|
|
|
|
|
|
|
def send(self, data):
|
|
|
|
"""Send data to remote."""
|
|
|
|
self.writefile.write(data)
|
|
|
|
self.writefile.flush()
|
|
|
|
|
|
|
|
|
|
|
|
def shutdown(self):
|
|
|
|
"""Close I/O established in "open"."""
|
|
|
|
self.readfile.close()
|
|
|
|
self.writefile.close()
|
2008-11-06 03:39:50 +08:00
|
|
|
self.process.wait()
|
2002-11-22 13:53:04 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
1998-06-18 22:24:28 +08:00
|
|
|
class _Authenticator:
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
"""Private class to provide en/decoding
|
|
|
|
for base64-based authentication conversation.
|
|
|
|
"""
|
|
|
|
|
|
|
|
def __init__(self, mechinst):
|
|
|
|
self.mech = mechinst # Callable object to provide/process data
|
|
|
|
|
|
|
|
def process(self, data):
|
|
|
|
ret = self.mech(self.decode(data))
|
|
|
|
if ret is None:
|
2015-07-31 04:59:02 +08:00
|
|
|
return b'*' # Abort conversation
|
2001-01-15 07:47:14 +08:00
|
|
|
return self.encode(ret)
|
|
|
|
|
|
|
|
def encode(self, inp):
|
|
|
|
#
|
|
|
|
# Invoke binascii.b2a_base64 iteratively with
|
|
|
|
# short even length buffers, strip the trailing
|
|
|
|
# line feed from the result and append. "Even"
|
|
|
|
# means a number that factors to both 6 and 8,
|
|
|
|
# so when it gets to the end of the 8-bit input
|
|
|
|
# there's no partial 6-bit output.
|
|
|
|
#
|
2013-02-20 01:17:31 +08:00
|
|
|
oup = b''
|
|
|
|
if isinstance(inp, str):
|
2015-05-11 07:17:23 +08:00
|
|
|
inp = inp.encode('utf-8')
|
2001-01-15 07:47:14 +08:00
|
|
|
while inp:
|
|
|
|
if len(inp) > 48:
|
|
|
|
t = inp[:48]
|
|
|
|
inp = inp[48:]
|
|
|
|
else:
|
|
|
|
t = inp
|
2013-02-20 01:17:31 +08:00
|
|
|
inp = b''
|
2001-01-15 07:47:14 +08:00
|
|
|
e = binascii.b2a_base64(t)
|
|
|
|
if e:
|
|
|
|
oup = oup + e[:-1]
|
|
|
|
return oup
|
|
|
|
|
|
|
|
def decode(self, inp):
|
|
|
|
if not inp:
|
2013-02-20 01:17:31 +08:00
|
|
|
return b''
|
2001-01-15 07:47:14 +08:00
|
|
|
return binascii.a2b_base64(inp)
|
|
|
|
|
2012-06-23 09:03:39 +08:00
|
|
|
Months = ' Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec'.split(' ')
|
|
|
|
Mon2num = {s.encode():n+1 for n, s in enumerate(Months[1:])}
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
def Internaldate2tuple(resp):
|
2011-01-20 03:53:30 +08:00
|
|
|
"""Parse an IMAP4 INTERNALDATE string.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2011-01-20 03:53:30 +08:00
|
|
|
Return corresponding local time. The return value is a
|
|
|
|
time.struct_time tuple or None if the string has wrong format.
|
2001-01-15 07:47:14 +08:00
|
|
|
"""
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
mo = InternalDate.match(resp)
|
|
|
|
if not mo:
|
|
|
|
return None
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
mon = Mon2num[mo.group('mon')]
|
|
|
|
zonen = mo.group('zonen')
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-02-22 21:24:27 +08:00
|
|
|
day = int(mo.group('day'))
|
|
|
|
year = int(mo.group('year'))
|
|
|
|
hour = int(mo.group('hour'))
|
|
|
|
min = int(mo.group('min'))
|
|
|
|
sec = int(mo.group('sec'))
|
|
|
|
zoneh = int(mo.group('zoneh'))
|
|
|
|
zonem = int(mo.group('zonem'))
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
# INTERNALDATE timezone must be subtracted to get UT
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
zone = (zoneh*60 + zonem)*60
|
2011-01-30 01:19:08 +08:00
|
|
|
if zonen == b'-':
|
2001-01-15 07:47:14 +08:00
|
|
|
zone = -zone
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
tt = (year, mon, day, hour, min, sec, -1, -1, -1)
|
2012-04-30 03:56:49 +08:00
|
|
|
utc = calendar.timegm(tt) - zone
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2012-04-30 03:56:49 +08:00
|
|
|
return time.localtime(utc)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def Int2AP(num):
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
"""Convert integer to A-P string representation."""
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2008-11-06 03:39:50 +08:00
|
|
|
val = b''; AP = b'ABCDEFGHIJKLMNOP'
|
2001-01-15 07:47:14 +08:00
|
|
|
num = int(abs(num))
|
|
|
|
while num:
|
|
|
|
num, mod = divmod(num, 16)
|
2008-11-06 03:39:50 +08:00
|
|
|
val = AP[mod:mod+1] + val
|
2001-01-15 07:47:14 +08:00
|
|
|
return val
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def ParseFlags(resp):
|
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
"""Convert IMAP4 flags response to python tuple."""
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
mo = Flags.match(resp)
|
|
|
|
if not mo:
|
|
|
|
return ()
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2001-02-09 14:50:21 +08:00
|
|
|
return tuple(mo.group('flags').split())
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
|
|
|
def Time2Internaldate(date_time):
|
|
|
|
|
2011-01-20 03:53:30 +08:00
|
|
|
"""Convert date_time to IMAP4 INTERNALDATE representation.
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2011-01-20 03:53:30 +08:00
|
|
|
Return string in form: '"DD-Mmm-YYYY HH:MM:SS +HHMM"'. The
|
2011-11-12 02:35:42 +08:00
|
|
|
date_time argument can be a number (int or float) representing
|
2011-01-20 03:53:30 +08:00
|
|
|
seconds since epoch (as returned by time.time()), a 9-tuple
|
2012-06-23 09:03:39 +08:00
|
|
|
representing local time, an instance of time.struct_time (as
|
|
|
|
returned by time.localtime()), an aware datetime instance or a
|
2011-01-20 03:53:30 +08:00
|
|
|
double-quoted string. In the last case, it is assumed to already
|
|
|
|
be in the correct format.
|
2001-01-15 07:47:14 +08:00
|
|
|
"""
|
2002-01-06 01:17:09 +08:00
|
|
|
if isinstance(date_time, (int, float)):
|
2012-06-23 09:03:39 +08:00
|
|
|
dt = datetime.fromtimestamp(date_time,
|
|
|
|
timezone.utc).astimezone()
|
|
|
|
elif isinstance(date_time, tuple):
|
|
|
|
try:
|
|
|
|
gmtoff = date_time.tm_gmtoff
|
|
|
|
except AttributeError:
|
|
|
|
if time.daylight:
|
|
|
|
dst = date_time[8]
|
|
|
|
if dst == -1:
|
|
|
|
dst = time.localtime(time.mktime(date_time))[8]
|
|
|
|
gmtoff = -(time.timezone, time.altzone)[dst]
|
|
|
|
else:
|
|
|
|
gmtoff = -time.timezone
|
|
|
|
delta = timedelta(seconds=gmtoff)
|
|
|
|
dt = datetime(*date_time[:6], tzinfo=timezone(delta))
|
|
|
|
elif isinstance(date_time, datetime):
|
|
|
|
if date_time.tzinfo is None:
|
|
|
|
raise ValueError("date_time must be aware")
|
|
|
|
dt = date_time
|
2002-06-17 15:07:20 +08:00
|
|
|
elif isinstance(date_time, str) and (date_time[0],date_time[-1]) == ('"','"'):
|
2001-01-15 07:47:14 +08:00
|
|
|
return date_time # Assume in correct format
|
2002-01-06 01:17:09 +08:00
|
|
|
else:
|
|
|
|
raise ValueError("date_time not of a known type")
|
2012-06-23 09:03:39 +08:00
|
|
|
fmt = '"%d-{}-%Y %H:%M:%S %z"'.format(Months[dt.month])
|
|
|
|
return dt.strftime(fmt)
|
1998-04-09 21:51:46 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
1999-12-14 07:27:45 +08:00
|
|
|
if __name__ == '__main__':
|
1998-04-09 21:51:46 +08:00
|
|
|
|
2002-11-22 13:53:04 +08:00
|
|
|
# To test: invoke either as 'python imaplib.py [IMAP4_server_hostname]'
|
|
|
|
# or 'python imaplib.py -s "rsh IMAP4_server_hostname exec /etc/rimapd"'
|
|
|
|
# to test the IMAP4_stream class
|
|
|
|
|
2001-08-13 23:34:41 +08:00
|
|
|
import getopt, getpass
|
2001-01-15 07:47:14 +08:00
|
|
|
|
|
|
|
try:
|
2002-11-22 13:53:04 +08:00
|
|
|
optlist, args = getopt.getopt(sys.argv[1:], 'd:s:')
|
2007-01-11 00:19:56 +08:00
|
|
|
except getopt.error as val:
|
2002-11-22 13:53:04 +08:00
|
|
|
optlist, args = (), ()
|
2001-01-15 07:47:14 +08:00
|
|
|
|
2002-11-22 13:53:04 +08:00
|
|
|
stream_command = None
|
2001-01-15 07:47:14 +08:00
|
|
|
for opt,val in optlist:
|
|
|
|
if opt == '-d':
|
|
|
|
Debug = int(val)
|
2002-11-22 13:53:04 +08:00
|
|
|
elif opt == '-s':
|
|
|
|
stream_command = val
|
|
|
|
if not args: args = (stream_command,)
|
2001-01-15 07:47:14 +08:00
|
|
|
|
|
|
|
if not args: args = ('',)
|
|
|
|
|
|
|
|
host = args[0]
|
|
|
|
|
|
|
|
USER = getpass.getuser()
|
2001-07-20 18:52:06 +08:00
|
|
|
PASSWD = getpass.getpass("IMAP password for %s on %s: " % (USER, host or "localhost"))
|
2001-01-15 07:47:14 +08:00
|
|
|
|
2003-04-30 07:40:59 +08:00
|
|
|
test_mesg = 'From: %(user)s@localhost%(lf)sSubject: IMAP4 test%(lf)s%(lf)sdata...%(lf)s' % {'user':USER, 'lf':'\n'}
|
2001-01-15 07:47:14 +08:00
|
|
|
test_seq1 = (
|
|
|
|
('login', (USER, PASSWD)),
|
|
|
|
('create', ('/tmp/xxx 1',)),
|
|
|
|
('rename', ('/tmp/xxx 1', '/tmp/yyy')),
|
|
|
|
('CREATE', ('/tmp/yyz 2',)),
|
|
|
|
('append', ('/tmp/yyz 2', None, None, test_mesg)),
|
|
|
|
('list', ('/tmp', 'yy*')),
|
|
|
|
('select', ('/tmp/yyz 2',)),
|
|
|
|
('search', (None, 'SUBJECT', 'test')),
|
2002-02-22 09:15:17 +08:00
|
|
|
('fetch', ('1', '(FLAGS INTERNALDATE RFC822)')),
|
2001-01-15 07:47:14 +08:00
|
|
|
('store', ('1', 'FLAGS', '(\Deleted)')),
|
2001-07-20 18:52:06 +08:00
|
|
|
('namespace', ()),
|
2001-01-15 07:47:14 +08:00
|
|
|
('expunge', ()),
|
|
|
|
('recent', ()),
|
|
|
|
('close', ()),
|
|
|
|
)
|
|
|
|
|
|
|
|
test_seq2 = (
|
|
|
|
('select', ()),
|
|
|
|
('response',('UIDVALIDITY',)),
|
|
|
|
('uid', ('SEARCH', 'ALL')),
|
|
|
|
('response', ('EXISTS',)),
|
|
|
|
('append', (None, None, None, test_mesg)),
|
|
|
|
('recent', ()),
|
|
|
|
('logout', ()),
|
|
|
|
)
|
|
|
|
|
|
|
|
def run(cmd, args):
|
2002-02-22 09:15:17 +08:00
|
|
|
M._mesg('%s %s' % (cmd, args))
|
2003-02-28 04:14:51 +08:00
|
|
|
typ, dat = getattr(M, cmd)(*args)
|
2002-02-22 09:15:17 +08:00
|
|
|
M._mesg('%s => %s %s' % (cmd, typ, dat))
|
2002-11-22 13:53:04 +08:00
|
|
|
if typ == 'NO': raise dat[0]
|
2001-01-15 07:47:14 +08:00
|
|
|
return dat
|
|
|
|
|
|
|
|
try:
|
2002-11-22 13:53:04 +08:00
|
|
|
if stream_command:
|
|
|
|
M = IMAP4_stream(stream_command)
|
|
|
|
else:
|
|
|
|
M = IMAP4(host)
|
|
|
|
if M.state == 'AUTH':
|
2002-11-24 10:35:35 +08:00
|
|
|
test_seq1 = test_seq1[1:] # Login not needed
|
2002-02-22 09:15:17 +08:00
|
|
|
M._mesg('PROTOCOL_VERSION = %s' % M.PROTOCOL_VERSION)
|
2004-02-13 01:35:32 +08:00
|
|
|
M._mesg('CAPABILITIES = %r' % (M.capabilities,))
|
2001-01-15 07:47:14 +08:00
|
|
|
|
|
|
|
for cmd,args in test_seq1:
|
|
|
|
run(cmd, args)
|
|
|
|
|
|
|
|
for ml in run('list', ('/tmp/', 'yy%')):
|
|
|
|
mo = re.match(r'.*"([^"]+)"$', ml)
|
|
|
|
if mo: path = mo.group(1)
|
2001-02-09 14:50:21 +08:00
|
|
|
else: path = ml.split()[-1]
|
2001-01-15 07:47:14 +08:00
|
|
|
run('delete', (path,))
|
|
|
|
|
|
|
|
for cmd,args in test_seq2:
|
|
|
|
dat = run(cmd, args)
|
|
|
|
|
|
|
|
if (cmd,args) != ('uid', ('SEARCH', 'ALL')):
|
|
|
|
continue
|
|
|
|
|
2001-02-09 14:50:21 +08:00
|
|
|
uid = dat[-1].split()
|
2001-01-15 07:47:14 +08:00
|
|
|
if not uid: continue
|
|
|
|
run('uid', ('FETCH', '%s' % uid[-1],
|
|
|
|
'(FLAGS INTERNALDATE RFC822.SIZE RFC822.HEADER RFC822.TEXT)'))
|
|
|
|
|
2007-02-09 13:37:30 +08:00
|
|
|
print('\nAll tests OK.')
|
2001-01-15 07:47:14 +08:00
|
|
|
|
|
|
|
except:
|
2007-02-09 13:37:30 +08:00
|
|
|
print('\nTests failed.')
|
2001-01-15 07:47:14 +08:00
|
|
|
|
|
|
|
if not Debug:
|
2007-02-09 13:37:30 +08:00
|
|
|
print('''
|
2000-03-29 04:20:53 +08:00
|
|
|
If you would like to see debugging output,
|
|
|
|
try: %s -d5
|
2007-02-09 13:37:30 +08:00
|
|
|
''' % sys.argv[0])
|
1998-04-11 09:22:34 +08:00
|
|
|
|
2001-01-15 07:47:14 +08:00
|
|
|
raise
|