Commit Graph

41393 Commits

Author SHA1 Message Date
Georg Brandl d6e0202931 Blocked revisions 85287,85354-85355,85357,85375,85456-85458,85526,85528,85531,85535,85577,85604 via svnmerge
........
  r85287 | georg.brandl | 2010-10-06 14:29:49 +0200 (Mi, 06 Okt 2010) | 1 line

  Update to Sphin 1.0.4.
........
  r85354 | georg.brandl | 2010-10-10 11:37:51 +0200 (So, 10 Okt 2010) | 1 line

  Update pydoc topics.
........
  r85355 | georg.brandl | 2010-10-10 11:40:34 +0200 (So, 10 Okt 2010) | 1 line

  Bump to 3.2a3.
........
  r85357 | georg.brandl | 2010-10-10 11:49:21 +0200 (So, 10 Okt 2010) | 1 line

  Rewrap.
........
  r85375 | georg.brandl | 2010-10-12 14:38:48 +0200 (Di, 12 Okt 2010) | 1 line

  Post-release bumps.
........
  r85456 | georg.brandl | 2010-10-14 09:04:07 +0200 (Do, 14 Okt 2010) | 1 line

  #9418: first step of moving private string methods to _string module.
........
  r85457 | georg.brandl | 2010-10-14 09:14:31 +0200 (Do, 14 Okt 2010) | 1 line

  #9964: fix pdb failure to import under -OO. Warn the user that help is simply not available in this case.
........
  r85458 | georg.brandl | 2010-10-14 09:17:44 +0200 (Do, 14 Okt 2010) | 1 line

  Remove unused imports.
........
  r85526 | georg.brandl | 2010-10-15 16:46:48 +0200 (Fr, 15 Okt 2010) | 1 line

  #5355: Provide mappings from Expat error numbers to string descriptions and backwards, in order to actually make it possible to analyze error codes provided by ExpatError.
........
  r85528 | georg.brandl | 2010-10-15 17:25:23 +0200 (Fr, 15 Okt 2010) | 1 line

  #5355 followup: add unit test for new dictionaries, and provide submodules from xml.parsers.expat as advertised.
........
  r85531 | georg.brandl | 2010-10-15 17:57:45 +0200 (Fr, 15 Okt 2010) | 1 line

  #2830: add html.escape() helper and move cgi.escape() uses in the standard library to it.  It defaults to quote=True and also escapes single quotes, which makes casual use safer.  The cgi.escape() interface is not touched, but emits a (silent) PendingDeprecationWarning.
........
  r85535 | georg.brandl | 2010-10-15 18:23:54 +0200 (Fr, 15 Okt 2010) | 1 line

  Remove unused label.
........
  r85577 | georg.brandl | 2010-10-16 22:33:11 +0200 (Sa, 16 Okt 2010) | 1 line

  Get rid of a "unused static function" warning.
........
  r85604 | georg.brandl | 2010-10-17 08:21:59 +0200 (So, 17 Okt 2010) | 1 line

  Note that maxtasksperchild is new in 3.2.
........
2010-11-26 08:44:18 +00:00
Georg Brandl c524cff3d3 Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r85530 | georg.brandl | 2010-10-15 17:32:05 +0200 (Fr, 15 Okt 2010) | 1 line

  Refrain from using inline suites.
........
  r85532 | georg.brandl | 2010-10-15 18:03:02 +0200 (Fr, 15 Okt 2010) | 1 line

  #7771: reference to documentation of dictview methods and operations.
........
  r85533 | georg.brandl | 2010-10-15 18:07:41 +0200 (Fr, 15 Okt 2010) | 1 line

  #9683: remove broken dead code dealing with nested arguments removed from Py3k, and update the docs and docstrings accordingly.
........
  r85534 | georg.brandl | 2010-10-15 18:19:43 +0200 (Fr, 15 Okt 2010) | 1 line

  #9801: document how list and dict proxies created by Managers behave w.r.t. mutable items.
........
  r85538 | georg.brandl | 2010-10-15 18:35:46 +0200 (Fr, 15 Okt 2010) | 1 line

  #7303: add documentation for useful pkgutil functions and classes.
........
  r85539 | georg.brandl | 2010-10-15 18:42:14 +0200 (Fr, 15 Okt 2010) | 1 line

  Fix issue references.
........
  r85540 | georg.brandl | 2010-10-15 18:42:37 +0200 (Fr, 15 Okt 2010) | 1 line

  #6798: fix wrong docs for the arguments to several trace events.
........
  r85541 | georg.brandl | 2010-10-15 18:53:24 +0200 (Fr, 15 Okt 2010) | 1 line

  #4968: updates to inspect.is* function docs.
........
  r85542 | georg.brandl | 2010-10-15 19:01:15 +0200 (Fr, 15 Okt 2010) | 1 line

  #7790: move table of struct_time members to the actual description of struct_time.
........
  r85543 | georg.brandl | 2010-10-15 19:03:02 +0200 (Fr, 15 Okt 2010) | 1 line

  #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in the docstrings.
........
  r85546 | georg.brandl | 2010-10-15 19:58:45 +0200 (Fr, 15 Okt 2010) | 1 line

  #5762: fix handling of empty namespace in minidom, which would result in AttributeError on toxml().
........
  r85547 | georg.brandl | 2010-10-15 20:00:35 +0200 (Fr, 15 Okt 2010) | 1 line

  #6098: Refrain from claiming DOM level 3 conformance in minidom.
........
  r85548 | georg.brandl | 2010-10-15 21:46:19 +0200 (Fr, 15 Okt 2010) | 1 line

  #10072: assume a bit less knowledge of the FTP protocol in the ftplib docs.
........
2010-11-26 08:42:45 +00:00
Georg Brandl aba9796c5e Merged revisions 85450-85455,85460-85465 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r85450 | georg.brandl | 2010-10-14 08:35:53 +0200 (Do, 14 Okt 2010) | 1 line

  #7642: update to os.system() docs.
........
  r85451 | georg.brandl | 2010-10-14 08:41:42 +0200 (Do, 14 Okt 2010) | 1 line

  #3865: add note about benchmarking with profilers, and move licensing stuff to bottom of document.
........
  r85452 | georg.brandl | 2010-10-14 08:43:22 +0200 (Do, 14 Okt 2010) | 1 line

  #10046: small correction to atexit docs.
........
  r85453 | georg.brandl | 2010-10-14 08:46:08 +0200 (Do, 14 Okt 2010) | 1 line

  #6825: small correction to split() docs.
........
  r85454 | georg.brandl | 2010-10-14 08:48:47 +0200 (Do, 14 Okt 2010) | 1 line

  Mention 2to3.
........
  r85455 | georg.brandl | 2010-10-14 08:59:45 +0200 (Do, 14 Okt 2010) | 1 line

  #1710703: write zipfile structures also in the case of closing a new, but empty, archive.
........
  r85460 | georg.brandl | 2010-10-14 09:24:28 +0200 (Do, 14 Okt 2010) | 1 line

  #9964: fix running test_import under -O or -OO.
........
  r85461 | georg.brandl | 2010-10-14 09:29:08 +0200 (Do, 14 Okt 2010) | 1 line

  #9964: fix lib2to3 fixer fix_operator when running under -OO.
........
  r85462 | georg.brandl | 2010-10-14 09:32:52 +0200 (Do, 14 Okt 2010) | 1 line

  #9964: fix running test_xml_etree under -OO.
........
  r85463 | georg.brandl | 2010-10-14 09:34:56 +0200 (Do, 14 Okt 2010) | 1 line

  Better check for "any optimize option given".
........
  r85464 | georg.brandl | 2010-10-14 09:42:27 +0200 (Do, 14 Okt 2010) | 1 line

  #9964: fix running test_compileall under -O and -OO.
........
  r85465 | georg.brandl | 2010-10-14 10:08:56 +0200 (Do, 14 Okt 2010) | 1 line

  #9964: fix running test_cmd_line_script under -O and -OO.
........
2010-11-26 08:37:46 +00:00
Eric Smith 229fab3a4c Blocked revisions 86751 via svnmerge
........
  r86751 | eric.smith | 2010-11-25 11:08:06 -0500 (Thu, 25 Nov 2010) | 1 line

  Issue #7094: Add alternate ('#') flag to __format__ methods for float, complex and Decimal. Allows greater control over when decimal points appear. Added to make transitioning from %-formatting easier. '#g' still has a problem with Decimal which I'll fix soon.
........
2010-11-25 18:04:56 +00:00
Jesus Cea 436709cff2 Compile correctly under OpenIndiana (and possibly Solaris 11 Express) 2010-11-25 17:05:57 +00:00
Ezio Melotti 3188b2082e Merged revisions 86737 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86737 | ezio.melotti | 2010-11-25 00:02:18 +0200 (Thu, 25 Nov 2010) | 1 line

  Add NEWS entry for r86732 and fix double function in the table.
........
2010-11-24 22:04:22 +00:00
Ezio Melotti 42cc06ebf4 Merged revisions 86732 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86732 | ezio.melotti | 2010-11-24 22:18:02 +0200 (Wed, 24 Nov 2010) | 1 line

  #10299: Add a table that lists all the built-in functions in functions.rst
........
2010-11-24 20:54:01 +00:00
Terry Reedy 8b7eef3413 Issue 1859: Document that textwrap does not break on \n
Merged from 86717
2010-11-23 20:25:19 +00:00
Georg Brandl 8d4a932e6c Merged revisions 85679 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r85679 | georg.brandl | 2010-10-18 07:06:18 +0200 (Mo, 18 Okt 2010) | 1 line

  Fix compiler warnings about formatting pid_t as an int, by always casting to long.
........
2010-11-23 08:00:50 +00:00
Terry Reedy 2b4cb96bf7 Issue 9222 Fix filetypes for open dialog 2010-11-23 06:07:04 +00:00
Alexander Belopolsky 5468f4ff10 Merged revisions 86697 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86697 | alexander.belopolsky | 2010-11-22 14:40:51 -0500 (Mon, 22 Nov 2010) | 1 line

  Issue #6878: Fixed return type of tkinter methods documented to return lists.
........
2010-11-22 19:45:06 +00:00
Antoine Pitrou 72d5a9d192 Merged revisions 86694 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86694 | antoine.pitrou | 2010-11-22 17:26:21 +0100 (lun., 22 nov. 2010) | 3 lines

  Fix test_multiprocessing when ctypes isn't available
........
2010-11-22 16:33:23 +00:00
Ezio Melotti 7157d33929 Blocked revisions 86690 via svnmerge
........
  r86690 | ezio.melotti | 2010-11-22 14:56:58 +0200 (Mon, 22 Nov 2010) | 1 line

  #9424: add a DeprecationWarning for assertEquals, assertNotEquals, assertAlmostEquals, assertNotAlmostEquals, and assert_
........
2010-11-22 13:05:22 +00:00
Martin v. Löwis 362976539f Issue #10459: Update CJK character names to Unicode 5.1. 2010-11-22 10:52:58 +00:00
Martin v. Löwis 8564b86274 Blocked revisions 86681 via svnmerge
........
  r86681 | martin.v.loewis | 2010-11-22 10:00:02 +0100 (Mo, 22 Nov 2010) | 2 lines

  Issue #10459: Update CJK character names to Unicode 6.0.
........
2010-11-22 09:01:28 +00:00
Senthil Kumaran c8f7bdf326 Merged revisions 86679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86679 | senthil.kumaran | 2010-11-22 13:08:13 +0800 (Mon, 22 Nov 2010) | 3 lines

  Fix - s/urllib2/urllib.request/
........
2010-11-22 05:11:05 +00:00
Senthil Kumaran d17ebdba4a Merged revisions 86676 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86676 | senthil.kumaran | 2010-11-22 12:48:26 +0800 (Mon, 22 Nov 2010) | 4 lines

  Fix Issue4493 - urllib2 adds '/' to the path component of url, when it does not
  starts with one. This behavior is exhibited by browser and other clients.
........
2010-11-22 04:53:57 +00:00
Éric Araujo f30fd10782 Blocked revisions 86671 via svnmerge
........
  r86671 | eric.araujo | 2010-11-22 04:13:47 +0100 (lun., 22 nov. 2010) | 2 lines

  Fix resource warning from patchcheck.py
........
2010-11-22 03:42:33 +00:00
Éric Araujo da825ab2dd Merged revisions 86670 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86670 | eric.araujo | 2010-11-22 04:09:19 +0100 (lun., 22 nov. 2010) | 5 lines


  Remove unnecessary `object` base class in docs (#10366).

  Also add a note about inheritance from `object` being default.
........
2010-11-22 03:18:24 +00:00
Brian Curtin f213d2317c Backport the distutils part of r83399 to fix #7645. 2010-11-22 02:04:33 +00:00
Éric Araujo 9fd9264155 Blocked revisions 86662 via svnmerge
........
  r86662 | eric.araujo | 2010-11-22 02:19:20 +0100 (lun., 22 nov. 2010) | 2 lines

  r84925 followup: add docstring for get_makefile_filename (+PEP 257 fixes)
........
2010-11-22 01:20:09 +00:00
Éric Araujo 6213cabfe6 Synchronize maintainers.rst 2010-11-22 01:00:52 +00:00
Brian Curtin b3d5531683 Merged revisions 86655 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86655 | brian.curtin | 2010-11-21 18:01:01 -0600 (Sun, 21 Nov 2010) | 2 lines

  Quote the paths in the event that they contain spaces.
........
2010-11-22 00:02:28 +00:00
Brian Curtin 44c1db05fb Merged revisions 86651 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86651 | brian.curtin | 2010-11-21 17:45:10 -0600 (Sun, 21 Nov 2010) | 5 lines

  Fix #6378. Start IDLE using the proper version of Python based on the directory
  tree that idle.bat resides in.

  Works with any/all versions of Python installed concurrently.
........
2010-11-21 23:48:14 +00:00
R. David Murray e977fae6b8 Blocked revisions 86642 via svnmerge
........
  r86642 | r.david.murray | 2010-11-21 11:53:48 -0500 (Sun, 21 Nov 2010) | 10 lines

  Fix TestBytesGeneratorIdempotent tests and a couple bugs they revealed.

  The tests that were failing on (some) windows machines, where the
  msg_XX.txt files used native \r\n lineseps are now also run on machines
  that use \n natively, and conversely the \n tests are run on Windows.
  The failing tests revealed one place where linesep needed to be added
  to a flatten call in generator.  There was also another that the tests
  didn't catch, so I added a test for that case as well.
........
2010-11-21 16:59:54 +00:00
Ezio Melotti 19f2aeba67 Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line

  #9424: Replace deprecated assert* methods in the Python test suite.
........
2010-11-21 01:30:29 +00:00
Éric Araujo b65b4937e2 Merged revisions 86625 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86625 | eric.araujo | 2010-11-21 00:56:22 +0100 (dim., 21 nov. 2010) | 2 lines

  Document index and count as part of the Sequence ABC (#9746)
........
2010-11-21 00:43:28 +00:00
R. David Murray 91f87788f0 Blocked revisions 86614 via svnmerge
........
  r86614 | r.david.murray | 2010-11-20 16:28:24 -0500 (Sat, 20 Nov 2010) | 2 lines

  Fix email doc update I overlooked (thanks, Éric)
........
2010-11-20 21:29:18 +00:00
R. David Murray 6a4d904074 Blocked revisions 86611 via svnmerge
........
  r86611 | r.david.murray | 2010-11-20 16:18:51 -0500 (Sat, 20 Nov 2010) | 4 lines

  #10453: compileall now uses argparse instead of getopt, so -h works.

  Patch by Michele Orrù.
........
2010-11-20 21:23:25 +00:00
Éric Araujo bfa17a562a Merged revisions 86601,86605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86601 | eric.araujo | 2010-11-20 20:35:27 +0100 (sam., 20 nov. 2010) | 2 lines

  Fix two NameErrors in distutils (#10407)
........
  r86605 | eric.araujo | 2010-11-20 20:37:28 +0100 (sam., 20 nov. 2010) | 2 lines

  Add entry for r86601
........
2010-11-20 19:45:32 +00:00
Antoine Pitrou 60d8684e4f Merged revisions 86603 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86603 | antoine.pitrou | 2010-11-20 20:36:05 +0100 (sam., 20 nov. 2010) | 3 lines

  In 3.x, bytearray is akin to bytes, not str.
........
2010-11-20 19:36:35 +00:00
Benjamin Peterson 5a1ca6e368 Merged revisions 86587 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86587 | benjamin.peterson | 2010-11-20 11:24:04 -0600 (Sat, 20 Nov 2010) | 1 line

  correct logic when pos is after the string #10467
........
2010-11-20 17:26:25 +00:00
Senthil Kumaran e062ba48b6 Merged revisions 86580 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86580 | senthil.kumaran | 2010-11-21 01:02:50 +0800 (Sun, 21 Nov 2010) | 3 lines

  Fix issue10377 - Output from pstats - it is just secs (i.e, wallclock time) and not CPU time.
........
2010-11-20 17:08:19 +00:00
R. David Murray 07b9e69247 Blocked revisions 86567 via svnmerge
........
  r86567 | r.david.murray | 2010-11-20 10:10:13 -0500 (Sat, 20 Nov 2010) | 5 lines

  Improve TestBytesGeneratorIdempotent using by using linesep.

  Also corrects a typo from a previous commit.  Unfortunately
  this does *not* fix issue #10134.
........
2010-11-20 15:14:35 +00:00
Georg Brandl fbef44f255 Merged revisions 85970 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r85970 | georg.brandl | 2010-10-30 10:29:28 +0200 (Sa, 30 Okt 2010) | 1 line

  #10198: fix duplicate header when writeframes() is called with an empty string.
........
2010-11-20 11:29:58 +00:00
Georg Brandl 7fef7a8375 Blocked revisions 86555 via svnmerge
........
  r86555 | georg.brandl | 2010-11-20 12:25:01 +0100 (Sa, 20 Nov 2010) | 1 line

  #10465: fix broken delegation in __getattr__ of _PaddedFile.
........
2010-11-20 11:26:56 +00:00
Benjamin Peterson 787cddc93d Merged revisions 86545 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86545 | benjamin.peterson | 2010-11-19 22:31:07 -0600 (Fri, 19 Nov 2010) | 1 line

  new plan: functions that want 'tmp' can declare it
........
2010-11-20 04:37:00 +00:00
R. David Murray fdd52bea44 Blocked revisions 86542 via svnmerge
........
  r86542 | r.david.murray | 2010-11-19 22:48:58 -0500 (Fri, 19 Nov 2010) | 2 lines

  Make test class name unique so that both test classes run.
........
2010-11-20 04:00:05 +00:00
Benjamin Peterson e82c169622 Merged revisions 86540 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86540 | benjamin.peterson | 2010-11-19 20:01:45 -0600 (Fri, 19 Nov 2010) | 1 line

  c89 declarations
........
2010-11-20 02:04:14 +00:00
Benjamin Peterson aab9585130 Merged revisions 86538 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86538 | benjamin.peterson | 2010-11-19 19:38:49 -0600 (Fri, 19 Nov 2010) | 1 line

  use %R format code; fixes invalid dereferencing #10391
........
2010-11-20 01:48:38 +00:00
Antoine Pitrou c9a9417f48 Merged revisions 86533 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86533 | antoine.pitrou | 2010-11-19 21:07:52 +0100 (ven., 19 nov. 2010) | 3 lines

  Fix test_ssl_presence when ssl is not present
........
2010-11-19 20:10:53 +00:00
Ezio Melotti 92165e6af7 Merged revisions 86528 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86528 | ezio.melotti | 2010-11-18 21:48:27 +0200 (Thu, 18 Nov 2010) | 1 line

  #10455: fix typo
........
2010-11-18 19:49:19 +00:00
Alexander Belopolsky 689aa6d3fa Merged revisions 86526 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86526 | alexander.belopolsky | 2010-11-18 13:50:13 -0500 (Thu, 18 Nov 2010) | 1 line

  Issue 7828: Fixed chr() and ord() documentation for wide characters
........
2010-11-18 18:52:11 +00:00
Senthil Kumaran dae5b84fe7 Merged revisions 86523 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86523 | senthil.kumaran | 2010-11-19 01:08:48 +0800 (Fri, 19 Nov 2010) | 3 lines

  Code Changes as per review comments by Antoine Pitrou.
........
2010-11-18 17:11:45 +00:00
Senthil Kumaran 723a7a6d93 Merged revisions 86520 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86520 | senthil.kumaran | 2010-11-18 23:36:41 +0800 (Thu, 18 Nov 2010) | 3 lines

  Fix Issue2244 - urllib unquotes user and password info multiple times - Patch by Theodore Turocy
........
2010-11-18 16:44:38 +00:00
Senthil Kumaran f2849f0fb4 Merged revisions 86514 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86514 | senthil.kumaran | 2010-11-18 23:00:53 +0800 (Thu, 18 Nov 2010) | 3 lines

  Fix Issue 9991: xmlrpc client ssl check faulty
........
2010-11-18 15:04:41 +00:00
Alexander Belopolsky 4979b9b91e Merged revisions 86504 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86504 | alexander.belopolsky | 2010-11-17 20:52:54 -0500 (Wed, 17 Nov 2010) | 15 lines

  Issue #10446: Several changes to module documentation generated by pydoc:

  1. Online reference manual link is now version-specific and the
     'MODULE DOCS' section renamed to 'MODULE REFERENCE'.

  2. 'FILE' section is moved to the end of the file.

  3. Special names processed by pydoc such as __version__ or __credits__
     are now excluded from the DATA section.

  4. Defined __all__ to prevent pydoc from exposing undocumented details
     about itself.

  5. Removed Python 2.3 compatibility code.
........
2010-11-18 01:58:16 +00:00
Éric Araujo 6083170858 Blocked revisions 86235 via svnmerge
........
  r86235 | eric.araujo | 2010-11-06 03:12:51 +0100 (sam., 06 nov. 2010) | 2 lines

  Fix one omission in r78359
........
2010-11-17 23:11:01 +00:00
Ezio Melotti 4fdf0fe5b7 Merged revisions 86488 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86488 | ezio.melotti | 2010-11-16 22:57:59 +0200 (Tue, 16 Nov 2010) | 1 line

  Fix typo
........
2010-11-16 21:06:43 +00:00
Alexander Belopolsky 9ec2c52817 Merged revisions 86478 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86478 | alexander.belopolsky | 2010-11-16 09:29:01 -0500 (Tue, 16 Nov 2010) | 1 line

  Issue #10413: Updated comments to reflect code changes
........
2010-11-16 16:10:44 +00:00