python_lang:hongbins-mirror.git
7 years agoMerged revisions 82492 via svnmerge from release26-maint
victor.stinner [Sat, 3 Jul 2010 13:39:22 +0000 (13:39 +0000)]
Merged revisions 82492 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82492 | victor.stinner | 2010-07-03 15:36:19 +0200 (sam., 03 juil. 2010) | 3 lines

  Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module,
  ensure that the input string length is a multiple of the frame size
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82494 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoFix markup.
georg.brandl [Sat, 3 Jul 2010 10:29:20 +0000 (10:29 +0000)]
Fix markup.

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82486 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82476 via svnmerge from
mark.dickinson [Sat, 3 Jul 2010 09:16:01 +0000 (09:16 +0000)]
Merged revisions 82476 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82476 | mark.dickinson | 2010-07-03 10:15:09 +0100 (Sat, 03 Jul 2010) | 1 line

  Fix typo in sys.float_info docs.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82477 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 81758-81759 via svnmerge from
ezio.melotti [Sat, 3 Jul 2010 05:34:39 +0000 (05:34 +0000)]
Merged revisions 81758-81759 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81758 | ezio.melotti | 2010-06-05 20:51:07 +0300 (Sat, 05 Jun 2010) | 15 lines

  Update PyUnicode_DecodeUTF8 from RFC 2279 to RFC 3629.

  1) #8271: when a byte sequence is invalid, only the start byte and all the
     valid continuation bytes are now replaced by U+FFFD, instead of replacing
     the number of bytes specified by the start byte.
     See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf (pages 94-95);
  2) 5- and 6-bytes-long UTF-8 sequences are now considered invalid (no changes
     in behavior);
  3) Add code and tests to reject surrogates (U+D800-U+DFFF) as defined in
     RFC 3629, but leave it commented out since it's not backward compatible;
  4) Change the error messages "unexpected code byte" to "invalid start byte"
     and "invalid data" to "invalid continuation byte";
  5) Add an extensive set of tests in test_unicode;
  6) Fix test_codeccallbacks because it was failing after this change.
........
  r81759 | ezio.melotti | 2010-06-05 22:21:32 +0300 (Sat, 05 Jun 2010) | 1 line

  Add a NEWS entry for r81758 and clarify a comment.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82470 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82457,82459 via svnmerge from
ezio.melotti [Fri, 2 Jul 2010 22:58:12 +0000 (22:58 +0000)]
Merged revisions 82457,82459 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82457 | ezio.melotti | 2010-07-03 01:17:29 +0300 (Sat, 03 Jul 2010) | 1 line

  #9139: Add examples for str.format().
........
  r82459 | ezio.melotti | 2010-07-03 01:50:39 +0300 (Sat, 03 Jul 2010) | 1 line

  #9139: the thousands separator is new in 2.7.  Also add a missing variable in the example.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82460 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82455 via svnmerge from
eric.smith [Fri, 2 Jul 2010 22:24:54 +0000 (22:24 +0000)]
Merged revisions 82455 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82455 | eric.smith | 2010-07-02 17:44:16 -0400 (Fri, 02 Jul 2010) | 1 line

  Moved period outside paren, where it belongs.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82458 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82446 via svnmerge from
mark.dickinson [Fri, 2 Jul 2010 20:24:32 +0000 (20:24 +0000)]
Merged revisions 82446 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82446 | mark.dickinson | 2010-07-02 19:06:52 +0100 (Fri, 02 Jul 2010) | 1 line

  Clarify sys.float_info documentation.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82451 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82447 via svnmerge from
benjamin.peterson [Fri, 2 Jul 2010 19:45:11 +0000 (19:45 +0000)]
Merged revisions 82447 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82447 | benjamin.peterson | 2010-07-02 14:41:39 -0500 (Fri, 02 Jul 2010) | 1 line

  add space
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82449 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoBlocked revisions 82439,82441 via svnmerge
nick.coghlan [Fri, 2 Jul 2010 16:17:17 +0000 (16:17 +0000)]
Blocked revisions 82439,82441 via svnmerge

........
  r82439 | nick.coghlan | 2010-07-03 01:50:14 +1000 (Sat, 03 Jul 2010) | 1 line

  Fix a couple of minor nits in What's New before the release goes out
........
  r82441 | nick.coghlan | 2010-07-03 02:01:53 +1000 (Sat, 03 Jul 2010) | 1 line

  Issue 8202 actually caused an unintended behavioural change and was reverted in 2.7 - remove reference from What's New
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82444 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82429 via svnmerge from
benjamin.peterson [Thu, 1 Jul 2010 23:41:09 +0000 (23:41 +0000)]
Merged revisions 82429 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82429 | benjamin.peterson | 2010-07-01 18:35:37 -0500 (Thu, 01 Jul 2010) | 1 line

  trunc does use the special method, though
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82431 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82420 via svnmerge from
benjamin.peterson [Thu, 1 Jul 2010 17:48:16 +0000 (17:48 +0000)]
Merged revisions 82420 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82420 | benjamin.peterson | 2010-07-01 12:45:52 -0500 (Thu, 01 Jul 2010) | 1 line

  fix fixer name
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82421 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82415 via svnmerge from
benjamin.peterson [Thu, 1 Jul 2010 16:16:24 +0000 (16:16 +0000)]
Merged revisions 82415 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82415 | benjamin.peterson | 2010-07-01 10:07:15 -0500 (Thu, 01 Jul 2010) | 1 line

  remove docs about delegating to special methods; it does no such thing
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82418 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82404 via svnmerge from
giampaolo.rodola [Wed, 30 Jun 2010 17:41:25 +0000 (17:41 +0000)]
Merged revisions 82404 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82404 | giampaolo.rodola | 2010-06-30 19:38:28 +0200 (mer, 30 giu 2010) | 1 line

  fix issue #6589: cleanup asyncore.socket_map if smtpd.SMTPServer constructor raises an exception
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82406 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82400 via svnmerge from
mark.dickinson [Wed, 30 Jun 2010 16:33:23 +0000 (16:33 +0000)]
Merged revisions 82400 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82400 | mark.dickinson | 2010-06-30 17:27:57 +0100 (Wed, 30 Jun 2010) | 2 lines

  Issue #9125:  Update parser module for "except ... as ..." syntax.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82401 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82379 via svnmerge from
mark.dickinson [Tue, 29 Jun 2010 20:09:50 +0000 (20:09 +0000)]
Merged revisions 82379 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82379 | mark.dickinson | 2010-06-29 21:09:12 +0100 (Tue, 29 Jun 2010) | 1 line

  Issue #1789:  clarify that the 'size' column in struct docs refers to standard size.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82380 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82368 via svnmerge from
benjamin.peterson [Tue, 29 Jun 2010 15:26:43 +0000 (15:26 +0000)]
Merged revisions 82368 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82368 | benjamin.peterson | 2010-06-29 10:18:02 -0500 (Tue, 29 Jun 2010) | 1 line

  group cStringIO docs under its factory function
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82369 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82363 via svnmerge from
senthil.kumaran [Tue, 29 Jun 2010 13:31:48 +0000 (13:31 +0000)]
Merged revisions 82363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82363 | senthil.kumaran | 2010-06-29 18:58:20 +0530 (Tue, 29 Jun 2010) | 3 lines

  Documentation Fix: urllib.urlopen.info uses mimetools.Message, not httplib.HTTPMessage.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82364 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoTools/unicode/mkstringprep.py: Don't use string exceptions,
matthias.klose [Tue, 29 Jun 2010 10:59:31 +0000 (10:59 +0000)]
Tools/unicode/mkstringprep.py: Don't use string exceptions,
partial backport from r78982.

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82361 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82334 via svnmerge from
senthil.kumaran [Mon, 28 Jun 2010 17:11:32 +0000 (17:11 +0000)]
Merged revisions 82334 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82334 | senthil.kumaran | 2010-06-28 22:37:40 +0530 (Mon, 28 Jun 2010) | 3 lines

  Documentation correction. urllib2.urlopen.info returns a mimetools.Message instance not HTTPMessage object.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82335 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82324 via svnmerge from
senthil.kumaran [Mon, 28 Jun 2010 13:59:49 +0000 (13:59 +0000)]
Merged revisions 82324 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82324 | senthil.kumaran | 2010-06-28 19:26:46 +0530 (Mon, 28 Jun 2010) | 3 lines

  Fix Issue8653 - Docstring for urlunsplit function.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82325 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82322 via svnmerge from
senthil.kumaran [Mon, 28 Jun 2010 10:58:16 +0000 (10:58 +0000)]
Merged revisions 82322 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82322 | senthil.kumaran | 2010-06-28 16:24:17 +0530 (Mon, 28 Jun 2010) | 3 lines

  Fix issue3428 - Document HTTPMessage class.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82323 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82284 via svnmerge from
ronald.oussoren [Sun, 27 Jun 2010 14:00:56 +0000 (14:00 +0000)]
Merged revisions 82284 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82284 | ronald.oussoren | 2010-06-27 15:59:39 +0200 (Sun, 27 Jun 2010) | 4 lines

  Fix for Issue8883: without this patch test_urllib will fail
  when there is a bare IP address in the "Bypass proxy settings
  for these Hosts & Domains" list on MacOSX.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82285 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82150 via svnmerge from
ronald.oussoren [Sun, 27 Jun 2010 12:49:49 +0000 (12:49 +0000)]
Merged revisions 82150 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82150 | ronald.oussoren | 2010-06-22 11:32:22 +0200 (Tue, 22 Jun 2010) | 12 lines

  The code in _scproxy (a mac specific helper module to
  detect proxy settings) had the wrong logic for detecting
  if the checkbox 'Exclude simple hostnames' is checked. This
  checkin fixes that.

  As a result the test failure 'Issue8455' goes away on systems
  where the checkbox is not checked.

  I'm carefully avoiding saying that is fixes that issue,
  test_urllib2_localnet assumes that system proxy settings are
  empty (not just on OSX, see Issue8455 for details).
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82280 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82276 via svnmerge from
ronald.oussoren [Sun, 27 Jun 2010 12:44:44 +0000 (12:44 +0000)]
Merged revisions 82276 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82276 | ronald.oussoren | 2010-06-27 14:43:47 +0200 (Sun, 27 Jun 2010) | 5 lines

  The uuid library on OSX 10.5 seems to contain the same bug as the one
  on OSX 10.6, therefore don't use it there either.

  This fixes issue8621.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82277 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82272 via svnmerge from
ronald.oussoren [Sun, 27 Jun 2010 12:39:22 +0000 (12:39 +0000)]
Merged revisions 82272 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82272 | ronald.oussoren | 2010-06-27 14:36:16 +0200 (Sun, 27 Jun 2010) | 8 lines

  Two small fixes for the support for SDKs on MacOSX:

  1) The code that checks if an path should be located in the SDK
     explicitly excludes /usr/local. This fixes issue9046

  2) The SDK variant for filtering "db_dirs_to_check" in setup.py
     was not doing anything because of a missing assignment.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82274 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years ago#9085: bump email package version to its correct value.
r.david.murray [Sat, 26 Jun 2010 19:01:40 +0000 (19:01 +0000)]
#9085: bump email package version to its correct value.

Previous versions of 2.6 have 4.0.1 because of a missed trunk
commit when 2.5 was released.

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82257 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82251 via svnmerge from
alexander.belopolsky [Sat, 26 Jun 2010 18:53:49 +0000 (18:53 +0000)]
Merged revisions 82251 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82251 | alexander.belopolsky | 2010-06-26 14:49:10 -0400 (Sat, 26 Jun 2010) | 1 line

  Issue 9024: Added :cdata: tag to PyDateTimeAPI
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82254 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82248 via svnmerge from
ezio.melotti [Sat, 26 Jun 2010 18:47:01 +0000 (18:47 +0000)]
Merged revisions 82248 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82248 | ezio.melotti | 2010-06-26 21:44:42 +0300 (Sat, 26 Jun 2010) | 1 line

  Fix extra space.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82250 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoBlocked revisions 82246 via svnmerge
r.david.murray [Sat, 26 Jun 2010 18:45:43 +0000 (18:45 +0000)]
Blocked revisions 82246 via svnmerge

........
  r82246 | r.david.murray | 2010-06-26 14:39:50 -0400 (Sat, 26 Jun 2010) | 8 lines

  #9085: email versions have gotten out of sync, 2.7 is actually 4.0.3.

  In 2.5 the email version was bumped to 4.0.2 just before release but
  after the maintenance branch was set up.  The bump was not backported
  to trunk, and 2.6 went out the door with a version number of 4.0.1.
  I bumped this to 4.0.2 because of a behavior change, but that makes
  it look the same as 2.5.  So bump it again to 4.0.3.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82249 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82233,82242 via svnmerge from
r.david.murray [Sat, 26 Jun 2010 03:32:13 +0000 (03:32 +0000)]
Merged revisions 82233,82242 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82233 | r.david.murray | 2010-06-25 20:06:44 -0400 (Fri, 25 Jun 2010) | 2 lines

  #4640: add a test to optparse that proves issue is invalid.
........
  r82242 | r.david.murray | 2010-06-25 23:27:32 -0400 (Fri, 25 Jun 2010) | 2 lines

  Fix indentation in recently added test.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82243 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82236 via svnmerge from
alexander.belopolsky [Sat, 26 Jun 2010 02:12:19 +0000 (02:12 +0000)]
Merged revisions 82236 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82236 | alexander.belopolsky | 2010-06-25 22:05:19 -0400 (Fri, 25 Jun 2010) | 4 lines

  Issue #9024: Fixed mark-up for PyDateTime_IMPORT macro and added that
  it is typically used in module initialization function. Thanks Tim
  Golden for the patch.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82237 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82221 via svnmerge from
mark.dickinson [Fri, 25 Jun 2010 20:21:43 +0000 (20:21 +0000)]
Merged revisions 82221 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82221 | mark.dickinson | 2010-06-25 21:19:48 +0100 (Fri, 25 Jun 2010) | 1 line

  Fix indentation of Python code example in C comment.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82222 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoMerged revisions 82210 via svnmerge from
antoine.pitrou [Fri, 25 Jun 2010 00:09:05 +0000 (00:09 +0000)]
Merged revisions 82210 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82210 | antoine.pitrou | 2010-06-25 02:03:21 +0200 (ven., 25 juin 2010) | 4 lines

  Issue #9075: In the ssl module, remove the setting of a `debug` flag
  on an OpenSSL structure.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82212 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoBlocked revisions 82191 via svnmerge
stefan.krah [Thu, 24 Jun 2010 09:35:39 +0000 (09:35 +0000)]
Blocked revisions 82191 via svnmerge

........
  r82191 | stefan.krah | 2010-06-24 11:33:05 +0200 (Thu, 24 Jun 2010) | 5 lines

  Issue #9020: The Py_IS* macros from pyctype.h should generally only be
  used with signed/unsigned char arguments. For integer arguments, EOF
  has to be handled separately.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82192 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoIssue #8930: Remaining indentation fixes after the Grand Unified Indenting.
stefan.krah [Wed, 23 Jun 2010 18:17:18 +0000 (18:17 +0000)]
Issue #8930: Remaining indentation fixes after the Grand Unified Indenting.

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82179 6015fed2-1504-0410-9fe1-9d1591cc4771

7 years agoBlocked revisions 82177 via svnmerge
stefan.krah [Wed, 23 Jun 2010 18:15:16 +0000 (18:15 +0000)]
Blocked revisions 82177 via svnmerge

........
  r82177 | stefan.krah | 2010-06-23 20:12:09 +0200 (Wed, 23 Jun 2010) | 3 lines

  Issue #8930: Remaining indentation fixes after the Grand Unified Indenting.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82178 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 82169 via svnmerge from
antoine.pitrou [Tue, 22 Jun 2010 21:47:04 +0000 (21:47 +0000)]
Merged revisions 82169 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82169 | antoine.pitrou | 2010-06-22 23:42:05 +0200 (mar., 22 juin 2010) | 4 lines

  Fix misindents in compile.c (for Benjamin).
  Of course, whoever used the wrong indentation rules needs to be spanked.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82170 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 82157 via svnmerge from
benjamin.peterson [Tue, 22 Jun 2010 19:21:33 +0000 (19:21 +0000)]
Merged revisions 82157 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82157 | benjamin.peterson | 2010-06-22 14:16:37 -0500 (Tue, 22 Jun 2010) | 1 line

  remove INT_MAX assertions; they can fail with large Py_ssize_t #9058
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82158 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 82130 via svnmerge from
benjamin.peterson [Mon, 21 Jun 2010 15:39:28 +0000 (15:39 +0000)]
Merged revisions 82130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82130 | benjamin.peterson | 2010-06-21 10:27:46 -0500 (Mon, 21 Jun 2010) | 1 line

  fix finding visual studio 2008 on 64 bit #8854
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82132 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 82075 via svnmerge from
jean-paul.calderone [Fri, 18 Jun 2010 20:10:12 +0000 (20:10 +0000)]
Merged revisions 82075 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82075 | jean-paul.calderone | 2010-06-18 16:00:17 -0400 (Fri, 18 Jun 2010) | 12 lines

  Revert r60115

  This revision introduced quoting for strings containing | based
  on a misunderstanding of the commonly used quoting rules used
  on Windows.

  | is interpreted by cmd.exe, not by the MS C runtime argv initializer.
  It only needs to be quoted if it is part of an argument passed through
  cmd.exe.

  See issue1300, issue7839, and issue8972.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82077 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 82047 via svnmerge from
senthil.kumaran [Thu, 17 Jun 2010 16:41:47 +0000 (16:41 +0000)]
Merged revisions 82047 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82047 | senthil.kumaran | 2010-06-17 22:08:34 +0530 (Thu, 17 Jun 2010) | 3 lines

  Fix Issue4452 - Incorrect docstring of os.setpgrp
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82048 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoBlocked revisions 82039 via svnmerge
r.david.murray [Thu, 17 Jun 2010 01:45:27 +0000 (01:45 +0000)]
Blocked revisions 82039 via svnmerge

........
  r82039 | r.david.murray | 2010-06-16 21:36:52 -0400 (Wed, 16 Jun 2010) | 10 lines

  #8720: fix inspect regression by teaching getsourcefile about linecache.

  The fix for issue 4050 caused a regression:  before that fix, source
  lines in the linecache would eventually be found by inspect.  After the
  fix inspect reports an error earlier, and the source isn't found.
  The fix for the fix is to have getsourcefile look in the linecache for
  the file and return the psuedo-filename if the source is there, just as
  it already returns it if there is a PEP 302 loader.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82040 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 82026 via svnmerge from
senthil.kumaran [Wed, 16 Jun 2010 17:39:51 +0000 (17:39 +0000)]
Merged revisions 82026 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82026 | senthil.kumaran | 2010-06-16 23:07:32 +0530 (Wed, 16 Jun 2010) | 3 lines

  Addressing RDM's review comments on the doc change.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82027 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 82018 via svnmerge from
senthil.kumaran [Wed, 16 Jun 2010 16:17:33 +0000 (16:17 +0000)]
Merged revisions 82018 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82018 | senthil.kumaran | 2010-06-16 20:25:31 +0530 (Wed, 16 Jun 2010) | 3 lines

  Fix Issue8937 - SimpleHTTPServer should contain usage example
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82020 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoIssue #7384: If the system readline library is linked against
stefan.krah [Wed, 16 Jun 2010 14:17:22 +0000 (14:17 +0000)]
Issue #7384: If the system readline library is linked against
ncurses, do not link the readline module against ncursesw.

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82017 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoBlocked revisions 81678 via svnmerge
r.david.murray [Wed, 16 Jun 2010 02:51:26 +0000 (02:51 +0000)]
Blocked revisions 81678 via svnmerge

........
  r81678 | r.david.murray | 2010-06-03 16:19:25 -0400 (Thu, 03 Jun 2010) | 7 lines

  #8889: rewrite transient_internet so we don't use EAI_NODATA on FreeBSD.

  FreeBSD doesn't have socket.EAI_NODATA.  I rewrote the routine because
  there's no easy way to conditionally include a context manager in a
  with statement.  As a side benefit, instead of a stack of context
  managers there's now only one.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82013 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81675 via svnmerge from
r.david.murray [Wed, 16 Jun 2010 00:57:25 +0000 (00:57 +0000)]
Merged revisions 81675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81675 | r.david.murray | 2010-06-03 11:43:20 -0400 (Thu, 03 Jun 2010) | 10 lines

  #5610: use \Z not $ so we don't eat extra chars when body part ends with \r\n.

  If a body part ended with \r\n, feedparser, using '$' to terminate its
  search for the newline, would match on the \r\n, and think that it needed
  to strip two characters in order to account for the line end before the
  boundary.  That made it chop one too many characters off the end of
  the body part.  Using \Z makes the match correct.

  Patch and test by Tony Nelson.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82010 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81634 via svnmerge from
r.david.murray [Tue, 15 Jun 2010 23:21:18 +0000 (23:21 +0000)]
Merged revisions 81634 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81634 | r.david.murray | 2010-05-31 21:42:41 -0400 (Mon, 31 May 2010) | 2 lines

  #7583: clarify discussion of hard tab expansion in doctests.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@82007 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81992 via svnmerge from
mark.dickinson [Tue, 15 Jun 2010 08:38:21 +0000 (08:38 +0000)]
Merged revisions 81992 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81992 | mark.dickinson | 2010-06-15 09:33:03 +0100 (Tue, 15 Jun 2010) | 3 lines

  Issue #8469:  Further clarifications and improvements to struct module
  documentation.  Thanks Mads Kiilerich.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81993 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81957 via svnmerge from
mark.dickinson [Sat, 12 Jun 2010 18:55:47 +0000 (18:55 +0000)]
Merged revisions 81957 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81957 | mark.dickinson | 2010-06-12 19:50:34 +0100 (Sat, 12 Jun 2010) | 5 lines

  Issue #8469:  Add standard sizes to table in struct documentation; additional
  clarifications and documentation tweaks.

  Backport of revisions 81955-81956 from py3k.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81959 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81940-81942 via svnmerge from
georg.brandl [Sat, 12 Jun 2010 09:50:02 +0000 (09:50 +0000)]
Merged revisions 81940-81942 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81940 | georg.brandl | 2010-06-12 11:45:28 +0200 (Sa, 12 Jun 2010) | 1 line

  Add document on how to build.
........
  r81941 | georg.brandl | 2010-06-12 11:45:58 +0200 (Sa, 12 Jun 2010) | 1 line

  Fix gratuitous indentation.
........
  r81942 | georg.brandl | 2010-06-12 11:46:03 +0200 (Sa, 12 Jun 2010) | 1 line

  Update README.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81943 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81904 via svnmerge from
mark.dickinson [Sat, 12 Jun 2010 08:49:42 +0000 (08:49 +0000)]
Merged revisions 81904 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81904 | mark.dickinson | 2010-06-11 21:27:05 +0100 (Fri, 11 Jun 2010) | 4 lines

  Fix possible undefined behaviour from signed overflow in struct module.

  Backport of revisions 81897, 81898 and 81902 from py3k.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81935 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81933 via svnmerge from
georg.brandl [Sat, 12 Jun 2010 06:46:31 +0000 (06:46 +0000)]
Merged revisions 81933 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81933 | georg.brandl | 2010-06-12 08:45:33 +0200 (Sa, 12 Jun 2010) | 1 line

  Update version in README.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81934 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoIssue #8924: logging: Improved error handling for Unicode in exception text.
vinay.sajip [Fri, 11 Jun 2010 22:56:50 +0000 (22:56 +0000)]
Issue #8924: logging: Improved error handling for Unicode in exception text.

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81919 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81907 via svnmerge from
antoine.pitrou [Fri, 11 Jun 2010 21:48:02 +0000 (21:48 +0000)]
Merged revisions 81907 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81907 | antoine.pitrou | 2010-06-11 23:42:26 +0200 (ven., 11 juin 2010) | 5 lines

  Issue #8941: decoding big endian UTF-32 data in UCS-2 builds could crash
  the interpreter with characters outside the Basic Multilingual Plane
  (higher than 0x10000).
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81909 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoBlocked revisions 81899 via svnmerge
victor.stinner [Fri, 11 Jun 2010 19:24:20 +0000 (19:24 +0000)]
Blocked revisions 81899 via svnmerge

........
  r81899 | victor.stinner | 2010-06-11 21:22:28 +0200 (ven., 11 juin 2010) | 2 lines

  Issue #8362: Add Misc/maintainers.rst: list of module maintainers
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81900 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoBlocked revisions 81889 via svnmerge
ezio.melotti [Fri, 11 Jun 2010 02:24:59 +0000 (02:24 +0000)]
Blocked revisions 81889 via svnmerge

........
  r81889 | ezio.melotti | 2010-06-11 05:21:25 +0300 (Fri, 11 Jun 2010) | 1 line

  Remove extra ] from itertools.count docstring.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81890 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years ago#5753: mention PySys_SetArgvEx() in 2.6 What's News
andrew.kuchling [Fri, 11 Jun 2010 01:07:06 +0000 (01:07 +0000)]
#5753: mention PySys_SetArgvEx() in 2.6 What's News

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81887 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 79779 via svnmerge from
philip.jenvey [Wed, 9 Jun 2010 17:55:28 +0000 (17:55 +0000)]
Merged revisions 79779 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79779 | philip.jenvey | 2010-04-04 19:51:51 -0700 (Sun, 04 Apr 2010) | 2 lines

  fix escape_encode to return the correct consumed size
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81866 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81860 via svnmerge from
antoine.pitrou [Wed, 9 Jun 2010 16:31:23 +0000 (16:31 +0000)]
Merged revisions 81860 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81860 | antoine.pitrou | 2010-06-09 18:24:00 +0200 (mer., 09 juin 2010) | 3 lines

  Issue #8930: fix some C code indentation
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81861 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81847 via svnmerge from
brian.curtin [Tue, 8 Jun 2010 21:17:16 +0000 (21:17 +0000)]
Merged revisions 81847 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81847 | brian.curtin | 2010-06-08 16:15:06 -0500 (Tue, 08 Jun 2010) | 3 lines

  Move a variable declration outside of a loop to match what was
  done in r81843 for py3k.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81848 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81834 via svnmerge from
benjamin.peterson [Tue, 8 Jun 2010 14:58:25 +0000 (14:58 +0000)]
Merged revisions 81834 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81834 | benjamin.peterson | 2010-06-08 09:53:29 -0500 (Tue, 08 Jun 2010) | 1 line

  kill extra word
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81836 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81825 via svnmerge from
benjamin.peterson [Mon, 7 Jun 2010 22:38:19 +0000 (22:38 +0000)]
Merged revisions 81825 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81825 | benjamin.peterson | 2010-06-07 17:33:09 -0500 (Mon, 07 Jun 2010) | 1 line

  use unicode literals
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81828 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81820 via svnmerge from
benjamin.peterson [Mon, 7 Jun 2010 22:27:32 +0000 (22:27 +0000)]
Merged revisions 81820 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81820 | benjamin.peterson | 2010-06-07 17:23:23 -0500 (Mon, 07 Jun 2010) | 1 line

  correctly overflow when indexes are too large
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81822 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoBlocked revisions 81817 via svnmerge
ezio.melotti [Mon, 7 Jun 2010 22:04:54 +0000 (22:04 +0000)]
Blocked revisions 81817 via svnmerge

........
  r81817 | ezio.melotti | 2010-06-08 01:00:18 +0300 (Tue, 08 Jun 2010) | 1 line

  Silence deprecation warning in test___all__ caused by an import bsddb.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81819 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81769 via svnmerge from
ezio.melotti [Mon, 7 Jun 2010 21:53:10 +0000 (21:53 +0000)]
Merged revisions 81769 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81769 | ezio.melotti | 2010-06-06 01:28:10 +0300 (Sun, 06 Jun 2010) | 1 line

  Replace deprecated fail* methods with the equivalent assert* ones.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81815 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81788 via svnmerge from
tarek.ziade [Sun, 6 Jun 2010 20:10:03 +0000 (20:10 +0000)]
Merged revisions 81788 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81788 | tarek.ziade | 2010-06-06 22:05:20 +0200 (Sun, 06 Jun 2010) | 1 line

  Fixed #8909: now the doc details the size of the bitmap used in distutils' bdist_wininst
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81789 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81749 via svnmerge from
mark.dickinson [Sat, 5 Jun 2010 13:24:04 +0000 (13:24 +0000)]
Merged revisions 81749 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81749 | mark.dickinson | 2010-06-05 14:18:33 +0100 (Sat, 05 Jun 2010) | 2 lines

  Fix test_py3kwarn not to test for __cmp__-related DeprecationWarning.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81750 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81744 via svnmerge from
mark.dickinson [Sat, 5 Jun 2010 12:52:03 +0000 (12:52 +0000)]
Merged revisions 81744 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81744 | mark.dickinson | 2010-06-05 13:51:21 +0100 (Sat, 05 Jun 2010) | 1 line

  Fix comment typo.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81745 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81740 via svnmerge from
mark.dickinson [Sat, 5 Jun 2010 12:15:35 +0000 (12:15 +0000)]
Merged revisions 81740 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81740 | mark.dickinson | 2010-06-05 13:14:43 +0100 (Sat, 05 Jun 2010) | 5 lines

  Issue #8627: Fix "XXX undetected error" from unchecked PyErr_WarnPy3k return.
  This is just a quick fix:  if the warning is turned into an exception, the
  exception simply gets ignored.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81741 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81736 via svnmerge from
mark.dickinson [Sat, 5 Jun 2010 11:59:41 +0000 (11:59 +0000)]
Merged revisions 81736 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81736 | mark.dickinson | 2010-06-05 12:52:24 +0100 (Sat, 05 Jun 2010) | 1 line

  Issue #8627: remove out-of-date warning about overriding __cmp__
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81738 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81701 via svnmerge from
martin.v.loewis [Fri, 4 Jun 2010 19:46:21 +0000 (19:46 +0000)]
Merged revisions 81701 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81701 | martin.v.loewis | 2010-06-04 21:39:07 +0200 (Fr, 04 Jun 2010) | 2 lines

  Issue #6470: Drop UNC prefix in FixTk.py
  Patch by Christop Gohlke and Amaury Forgeot d'Arc.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81702 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81691 via svnmerge from
senthil.kumaran [Fri, 4 Jun 2010 17:20:13 +0000 (17:20 +0000)]
Merged revisions 81691 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81691 | senthil.kumaran | 2010-06-04 22:47:09 +0530 (Fri, 04 Jun 2010) | 3 lines

  test verifying the resp object is closed for HEAD response.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81693 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81687 via svnmerge from
senthil.kumaran [Fri, 4 Jun 2010 16:34:53 +0000 (16:34 +0000)]
Merged revisions 81687 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81687 | senthil.kumaran | 2010-06-04 22:02:14 +0530 (Fri, 04 Jun 2010) | 3 lines

  Fix issue6312 - close the resp object for HEAD response.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81688 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoAlso skip when test_support.verbose is false.
stefan.krah [Thu, 3 Jun 2010 16:04:47 +0000 (16:04 +0000)]
Also skip when test_support.verbose is false.

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81676 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81662 via svnmerge from
ronald.oussoren [Thu, 3 Jun 2010 14:59:56 +0000 (14:59 +0000)]
Merged revisions 81662 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81662 | ronald.oussoren | 2010-06-03 11:47:21 +0200 (Thu, 03 Jun 2010) | 9 lines

  Fix for issue #7724: ensure that distutils and python's own setup.py
  honor the MacOSX SDK when one is specified.

  This is needed to be able to build using the 10.4u SDK while running
  on OSX 10.6.

  This is a fixed version of the patch in r80963, I've tested this patch
  on OSX and Linux.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81674 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoBlocked revisions 81667 via svnmerge
lars.gustaebel [Thu, 3 Jun 2010 12:38:15 +0000 (12:38 +0000)]
Blocked revisions 81667 via svnmerge

........
  r81667 | lars.gustaebel | 2010-06-03 14:34:14 +0200 (Thu, 03 Jun 2010) | 8 lines

  Issue #8741: Fixed the TarFile.makelink() method that is responsible
  for extracting symbolic and hard link entries as regular files as a
  work-around on platforms that do not support filesystem links.

  This stopped working reliably after a change in r74571. I also added
  a few tests for this functionality.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81668 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81663 via svnmerge from
lars.gustaebel [Thu, 3 Jun 2010 10:07:08 +0000 (10:07 +0000)]
Merged revisions 81663 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81663 | lars.gustaebel | 2010-06-03 11:56:22 +0200 (Thu, 03 Jun 2010) | 4 lines

  Issue #8833: tarfile created hard link entries with a size
  field != 0 by mistake. The associated testcase did not
  expose this bug because it was broken too.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81664 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81658 via svnmerge from
r.david.murray [Wed, 2 Jun 2010 22:11:01 +0000 (22:11 +0000)]
Merged revisions 81658 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81658 | r.david.murray | 2010-06-02 18:03:15 -0400 (Wed, 02 Jun 2010) | 9 lines

  #1368247: make set_charset/MIMEText automatically encode unicode _payload.

  Fixes (mysterious, to the end user) UnicodeErrors when using utf-8 as
  the charset and unicode as the _text argument.  Also makes the way in
  which unicode gets encoded to quoted printable for other charsets more
  sane (it only worked by accident previously).  The _payload now is encoded
  to the charset.output_charset if it is unicode.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81659 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81652 via svnmerge from
antoine.pitrou [Wed, 2 Jun 2010 17:10:45 +0000 (17:10 +0000)]
Merged revisions 81652 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81652 | antoine.pitrou | 2010-06-02 19:08:47 +0200 (mer., 02 juin 2010) | 4 lines

  Issue #8873: add a documentation note about possible performance issues with the
  default of unbuffered IO in subprocess.Popen.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81653 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81645 via svnmerge from
senthil.kumaran [Wed, 2 Jun 2010 02:22:00 +0000 (02:22 +0000)]
Merged revisions 81645 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81645 | senthil.kumaran | 2010-06-02 07:49:15 +0530 (Wed, 02 Jun 2010) | 3 lines

  Fix issue8788 - description of doseq parameter in urllib.urlencode
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81646 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81635 via svnmerge from
georg.brandl [Tue, 1 Jun 2010 23:21:12 +0000 (23:21 +0000)]
Merged revisions 81635 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81635 | georg.brandl | 2010-06-01 09:25:23 +0200 (Di, 01 Jun 2010) | 1 line

  Put docs for RegexObject.search() before RegexObject.match() to mirror re.search() and re.match() order.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81644 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81640 via svnmerge from
brian.curtin [Tue, 1 Jun 2010 13:42:48 +0000 (13:42 +0000)]
Merged revisions 81640 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81640 | brian.curtin | 2010-06-01 08:29:13 -0500 (Tue, 01 Jun 2010) | 3 lines

  Fix #8618. Ask the Windows mixer API if there are any playback devices
  configured before attempting to test PlaySound.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81641 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81636 via svnmerge from
senthil.kumaran [Tue, 1 Jun 2010 12:42:44 +0000 (12:42 +0000)]
Merged revisions 81636 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81636 | senthil.kumaran | 2010-06-01 18:10:07 +0530 (Tue, 01 Jun 2010) | 3 lines

  Fix Issue8797 - urllib2 basic authentication fix for wrong passwords. It fails after 5 retries.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81637 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoBlocked revisions 81587 via svnmerge
r.david.murray [Mon, 31 May 2010 23:06:41 +0000 (23:06 +0000)]
Blocked revisions 81587 via svnmerge

........
  r81587 | r.david.murray | 2010-05-28 14:17:20 -0400 (Fri, 28 May 2010) | 2 lines

  Make the ctl-C shutdown of serve.py prettier.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81627 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81586 via svnmerge from
r.david.murray [Mon, 31 May 2010 22:57:24 +0000 (22:57 +0000)]
Merged revisions 81586 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81586 | r.david.murray | 2010-05-28 14:08:11 -0400 (Fri, 28 May 2010) | 2 lines

  Make reference to Generic Attribute Management a hyperlink.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81626 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81621 via svnmerge from
antoine.pitrou [Mon, 31 May 2010 17:02:35 +0000 (17:02 +0000)]
Merged revisions 81621 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81621 | antoine.pitrou | 2010-05-31 19:01:01 +0200 (lun., 31 mai 2010) | 4 lines

  Improve documentation for getaddrinfo() (part of #8857)
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81622 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81555 via svnmerge from
alexander.belopolsky [Mon, 31 May 2010 16:00:34 +0000 (16:00 +0000)]
Merged revisions 81555 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81555 | alexander.belopolsky | 2010-05-26 15:43:16 -0400 (Wed, 26 May 2010) | 3 lines

  Issue #7879: Do not test negative timestamps on any Windows platform
  including Windows CE.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81618 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81602 via svnmerge from
mark.dickinson [Sat, 29 May 2010 21:03:13 +0000 (21:03 +0000)]
Merged revisions 81602 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81602 | mark.dickinson | 2010-05-29 22:00:52 +0100 (Sat, 29 May 2010) | 1 line

  Untabify Modules/config.c.in.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81603 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81598 via svnmerge from
stefan.krah [Sat, 29 May 2010 12:57:00 +0000 (12:57 +0000)]
Merged revisions 81598 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81598 | stefan.krah | 2010-05-29 14:54:35 +0200 (Sat, 29 May 2010) | 1 line

  Fix typo
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81599 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81594 via svnmerge from
antoine.pitrou [Sat, 29 May 2010 12:08:31 +0000 (12:08 +0000)]
Merged revisions 81594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81594 | antoine.pitrou | 2010-05-29 14:06:13 +0200 (sam., 29 mai 2010) | 3 lines

  Issue #8840: Make documentation for truncate() clearer
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81596 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81579 via svnmerge from
benjamin.peterson [Fri, 28 May 2010 03:23:52 +0000 (03:23 +0000)]
Merged revisions 81579 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81579 | benjamin.peterson | 2010-05-27 22:10:31 -0500 (Thu, 27 May 2010) | 1 line

  2to3 doesn't fix test_support #6583
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81580 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoBlocked revisions 81318 via svnmerge
ezio.melotti [Thu, 27 May 2010 22:33:17 +0000 (22:33 +0000)]
Blocked revisions 81318 via svnmerge

........
  r81318 | ezio.melotti | 2010-05-19 03:32:52 +0300 (Wed, 19 May 2010) | 1 line

  Fix typo in argparse doc.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81573 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81566 via svnmerge from
alexander.belopolsky [Thu, 27 May 2010 21:53:16 +0000 (21:53 +0000)]
Merged revisions 81566 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81566 | alexander.belopolsky | 2010-05-27 16:55:27 -0400 (Thu, 27 May 2010) | 3 lines

  Issue #7150: Raise OverflowError if the result of adding or subtracting
  timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81569 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81551 via svnmerge from
mark.dickinson [Wed, 26 May 2010 19:07:12 +0000 (19:07 +0000)]
Merged revisions 81551 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81551 | mark.dickinson | 2010-05-26 20:06:33 +0100 (Wed, 26 May 2010) | 1 line

  Issue #8825: additional testcases for int(string, 0) and long(string, 0).
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81552 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoBlocked revisions 81543 via svnmerge
victor.stinner [Wed, 26 May 2010 17:31:46 +0000 (17:31 +0000)]
Blocked revisions 81543 via svnmerge

........
  r81543 | victor.stinner | 2010-05-26 19:25:28 +0200 (mer., 26 mai 2010) | 2 lines

  Issue #7449: Skip test_socketserver if threading support is disabled
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81544 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81517 via svnmerge from
brian.curtin [Wed, 26 May 2010 13:24:57 +0000 (13:24 +0000)]
Merged revisions 81517 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81517 | brian.curtin | 2010-05-25 10:06:15 -0500 (Tue, 25 May 2010) | 5 lines

  Fix #2810 - handle the case where some registry calls return
  ERROR_MORE_DATA, requiring another call to get the remaining data.

  Patch by Daniel Stutzbach
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81540 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81537 via svnmerge from
victor.stinner [Tue, 25 May 2010 22:40:38 +0000 (22:40 +0000)]
Merged revisions 81537 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81537 | victor.stinner | 2010-05-26 00:30:32 +0200 (mer., 26 mai 2010) | 3 lines

  Issue #3798: Write sys.exit() message to sys.stderr to use stderr encoding and
  error handler, instead of writing to the C stderr file in utf-8
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81539 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81527 via svnmerge from
mark.dickinson [Tue, 25 May 2010 19:47:22 +0000 (19:47 +0000)]
Merged revisions 81527 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81527 | mark.dickinson | 2010-05-25 20:44:49 +0100 (Tue, 25 May 2010) | 1 line

  Fix a NameError in test_enumerate.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81529 6015fed2-1504-0410-9fe1-9d1591cc4771

8 years agoMerged revisions 81521 via svnmerge from
r.david.murray [Tue, 25 May 2010 15:49:57 +0000 (15:49 +0000)]
Merged revisions 81521 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81521 | r.david.murray | 2010-05-25 11:32:06 -0400 (Tue, 25 May 2010) | 2 lines

  Issue 8818: urlparse/urlsplit keyword is 'scheme', not 'default_scheme'.
........

git-svn-id: http://svn.python.org/projects/python/branches/release26-maint@81523 6015fed2-1504-0410-9fe1-9d1591cc4771