Commit Graph

42594 Commits

Author SHA1 Message Date
Victor Stinner f7b5def8b4 Merged revisions 81179 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81179 | victor.stinner | 2010-05-14 23:52:26 +0200 (ven., 14 mai 2010) | 2 lines

  Fix regression introduced by r81154 (Issue #5099, subprocess destructor)
........
2010-05-14 21:53:32 +00:00
Victor Stinner 7be6dae3f6 Merged revisions 81166 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81166 | victor.stinner | 2010-05-14 17:53:20 +0200 (ven., 14 mai 2010) | 4 lines

  Issue #8711: add paragraph titles to c-api/unicode.rst

  (Python2 doesn't have PyUnicode_DecodeFSDefault*() functions)
........
2010-05-14 15:55:12 +00:00
Victor Stinner 4f25ac7abd Merged revisions 81163 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81163 | victor.stinner | 2010-05-14 16:20:07 +0200 (ven., 14 mai 2010) | 2 lines

  Doc: replace PEP xxx by :pep:`xxx` to create a link on the PEP
........
2010-05-14 14:30:11 +00:00
Brett Cannon b565ac8776 Merged revisions 81154 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81154 | brett.cannon | 2010-05-13 17:21:48 -0700 (Thu, 13 May 2010) | 15 lines

  subprocess.Popen.__del__ referenced global objects, which is a no-no thanks to
  interpreter shutdown semantics. Same issue goes for the methods that __del__
  called. Now all the methods capture the global objects it needs as default
  values to private parameters (could have stuck them on the class object itself,
  but since the objects have nothing directly to do with the class that seemed
  wrong).

  There is no test as making one that works is hard. This patch was
  verified against a consistently failing test in Mercurial's test suite, though,
  so it has been tested in some regard.

  Closes issue #5099. Thanks to Mary Stern for the bug report and Gabriel
  Genellina for writing another patch for the same issue and attempting to write
  a test.
........
2010-05-14 01:26:08 +00:00
Benjamin Peterson be6f086502 Merged revisions 81145 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81145 | benjamin.peterson | 2010-05-13 16:14:10 -0500 (Thu, 13 May 2010) | 1 line

  rip out mention of types.ListType #8703
........
2010-05-13 21:16:53 +00:00
Victor Stinner 3c7f430f15 Blocked revisions 81135,81137 via svnmerge
........
  r81135 | victor.stinner | 2010-05-13 18:18:14 +0200 (jeu., 13 mai 2010) | 6 lines

  Issue #8422, test_genericpath: skip the creation of a directory with an invalid
  UTF name on Mac OS X because the OS deny it (the name have to be a valid UTF8
  string).

  Merge r80163 from py3k branch.
........
  r81137 | victor.stinner | 2010-05-13 18:22:15 +0200 (jeu., 13 mai 2010) | 4 lines

  Fix verb tense in skip message.

  Ooops, merge also r80334 (patch by r.david.murray)
........
2010-05-13 16:24:45 +00:00
Senthil Kumaran b87d04fc96 Merged revisions 81130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81130 | senthil.kumaran | 2010-05-13 08:55:21 +0530 (Thu, 13 May 2010) | 3 lines

  Fix Issue8657 - adding git and git+ssh as know schemes.
........
2010-05-13 03:32:26 +00:00
Mark Dickinson 838edd8bc6 Merged revisions 81126 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81126 | mark.dickinson | 2010-05-12 20:53:36 +0100 (Wed, 12 May 2010) | 1 line

  Fix unused variable in test_factorial.
........
2010-05-12 19:56:10 +00:00
Antoine Pitrou 96125cf170 Merged revisions 81115 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81115 | antoine.pitrou | 2010-05-12 16:02:34 +0200 (mer., 12 mai 2010) | 3 lines

  Improve _ssl.c formatting
........
2010-05-12 14:05:34 +00:00
Antoine Pitrou ca561f5e72 Merged revisions 81098 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81098 | antoine.pitrou | 2010-05-12 01:42:28 +0200 (mer., 12 mai 2010) | 5 lines

  Issue #8681: Make the zlib module's error messages more informative when
  the zlib itself doesn't give any detailed explanation.
........
2010-05-11 23:45:55 +00:00
Antoine Pitrou 33c5813a59 Merged revisions 81094 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81094 | antoine.pitrou | 2010-05-12 01:32:31 +0200 (mer., 12 mai 2010) | 6 lines

  Issue #8672: Add a zlib test ensuring that an incomplete stream can be
  handled by a decompressor object without errors (it returns incomplete
  uncompressed data).
........
2010-05-11 23:33:53 +00:00
Brian Curtin 59170e37bb Backport of r81088, plus the exposure of the previously undocumented
*ReflectionKey functions. Apparently that was not backported.

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

........
  r81088 | brian.curtin | 2010-05-11 14:13:13 -0500 (Tue, 11 May 2010) | 13 lines

  #8575 - Update and reorganize some _winreg contents.

  I've removed the hopeful note about a future higher-level module since
  it's been in there for quite a long time and nothing of the sort has
  come up. There are a few places where markup was added to cross-reference
  other sections, and many of the external links have been removed and now
  point to newly created sections containing previously undocumented
  information.

  The Value Types section was created and it's contents were taken from
  a function-specific area, since it applies to more than just that
  function. It fits in better with the other newly documented constants.
........
2010-05-11 19:32:26 +00:00
Mark Dickinson 7ceb497ae6 Merged revisions 81079 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81079 | mark.dickinson | 2010-05-11 14:05:30 +0100 (Tue, 11 May 2010) | 1 line

  Issue #8674: fix another bogus overflow check in audioop module.
........
2010-05-11 13:08:26 +00:00
Georg Brandl b377b0e2e4 Merged revisions 78581 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78581 | michael.foord | 2010-03-02 15:22:15 +0100 (Di, 02 Mär 2010) | 1 line

  Link correction in documentation.
........
2010-05-10 21:12:44 +00:00
Mark Dickinson 47e3bf26f0 Merged revisions 81045 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81045 | mark.dickinson | 2010-05-10 17:07:42 +0100 (Mon, 10 May 2010) | 3 lines

  Issue #8674: Fix incorrect and UB-inducing overflow checks in audioop
  module.  Thanks Tomas Hoger for the patch.
........
2010-05-10 16:16:52 +00:00
Antoine Pitrou c7c96a90bc Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines

  Untabify C files. Will watch buildbots.
........
2010-05-09 15:15:40 +00:00
Eric Smith ba32864b2d Merged revisions 81026 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81026 | eric.smith | 2010-05-09 10:04:59 -0400 (Sun, 09 May 2010) | 1 line

  Issue 8671: Whitespace fix.
........
2010-05-09 14:07:57 +00:00
Jean-Paul Calderone 0819b092d6 Merged revisions 81007 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81007 | jean-paul.calderone | 2010-05-08 16:06:02 -0400 (Sat, 08 May 2010) | 1 line

  Skip signal handler re-installation if it is not necessary.  Issue 8354.
........
2010-05-08 21:11:28 +00:00
Benjamin Peterson 614813941d Merged revisions 80991 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80991 | benjamin.peterson | 2010-05-08 11:44:52 -0500 (Sat, 08 May 2010) | 1 line

  run and fix enumerate start test cases #8636
........
2010-05-08 16:51:40 +00:00
Senthil Kumaran a9a9f696d5 Merged revisions 80957 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80957 | senthil.kumaran | 2010-05-08 10:30:11 +0530 (Sat, 08 May 2010) | 2 lines

  Fixing the errors trigerred in test_urllib2net. Related to issue8656.
........
2010-05-08 05:03:45 +00:00
Senthil Kumaran 2add184b2d Merged revisions 80953 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80953 | senthil.kumaran | 2010-05-08 08:41:50 +0530 (Sat, 08 May 2010) | 3 lines

  Fix Issue8656 - urllib2 mangles file://-scheme URLs
........
2010-05-08 03:14:33 +00:00
Benjamin Peterson 6d54b0178b Merged revisions 80934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r80934 | benjamin.peterson | 2010-05-07 13:58:23 -0500 (Fri, 07 May 2010) | 69 lines

  Merged revisions 79911,79916-79917,80018,80418,80572-80573,80635-80639,80668,80922 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r79911 | benjamin.peterson | 2010-04-09 15:38:53 -0500 (Fri, 09 Apr 2010) | 1 line

    use absolute import
  ........
    r79916 | benjamin.peterson | 2010-04-09 16:05:21 -0500 (Fri, 09 Apr 2010) | 1 line

    generalize detection of __future__ imports and attach them to the tree
  ........
    r79917 | benjamin.peterson | 2010-04-09 16:11:44 -0500 (Fri, 09 Apr 2010) | 1 line

    don't try to 'fix' relative imports when absolute_import is enabled #8858
  ........
    r80018 | benjamin.peterson | 2010-04-12 16:12:12 -0500 (Mon, 12 Apr 2010) | 4 lines

    prevent diffs from being mangled is multiprocess mode #6409

    Patch by George Boutsioukis.
  ........
    r80418 | benjamin.peterson | 2010-04-23 16:00:03 -0500 (Fri, 23 Apr 2010) | 1 line

    remove unhelpful description
  ........
    r80572 | benjamin.peterson | 2010-04-27 20:33:54 -0500 (Tue, 27 Apr 2010) | 1 line

    use unicode literals
  ........
    r80573 | jeffrey.yasskin | 2010-04-27 23:08:27 -0500 (Tue, 27 Apr 2010) | 6 lines

    Don't transform imports that are already relative.  2to3 turned
      from . import refactor
    into
      from .. import refactor
    which broke the transformation of 2to3 itself.
  ........
    r80635 | benjamin.peterson | 2010-04-29 16:02:23 -0500 (Thu, 29 Apr 2010) | 1 line

    remove imports
  ........
    r80636 | benjamin.peterson | 2010-04-29 16:02:41 -0500 (Thu, 29 Apr 2010) | 1 line

    unicode literal
  ........
    r80637 | benjamin.peterson | 2010-04-29 16:03:42 -0500 (Thu, 29 Apr 2010) | 1 line

    must pass a string to Number
  ........
    r80638 | benjamin.peterson | 2010-04-29 16:05:34 -0500 (Thu, 29 Apr 2010) | 1 line

    unicode literals
  ........
    r80639 | benjamin.peterson | 2010-04-29 16:06:09 -0500 (Thu, 29 Apr 2010) | 1 line

    pass string to Number
  ........
    r80668 | jeffrey.yasskin | 2010-04-30 18:02:47 -0500 (Fri, 30 Apr 2010) | 4 lines

    Make 2to3 run under Python 2.5 so that the benchmark suite at
    http://hg.python.org/benchmarks/ can use it and still run on implementations
    that haven't gotten to 2.6 yet.  Fixes issue 8566.
  ........
    r80922 | benjamin.peterson | 2010-05-07 11:06:25 -0500 (Fri, 07 May 2010) | 1 line

    prevent xrange transformation from wrapping range calls it produces in list
  ........
................
2010-05-07 19:06:32 +00:00
Antoine Pitrou c7035cdc3e Merged revisions 80926 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80926 | antoine.pitrou | 2010-05-07 18:50:34 +0200 (ven., 07 mai 2010) | 5 lines

  Issue #8571: Fix an internal error when compressing or decompressing a
  chunk larger than 1GB with the zlib module's compressor and decompressor
  objects.
........
2010-05-07 16:59:00 +00:00
Mark Dickinson e02c9d22f6 Merged revisions 80758 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80758 | mark.dickinson | 2010-05-04 17:18:25 +0100 (Tue, 04 May 2010) | 9 lines

  Issue #1533: fix inconsistency in range function argument processing:
  any non-float non-integer argument is now converted to an integer (if
  possible) using its __int__ method.  Previously, only small arguments
  were treated this way; larger arguments (those whose __int__ was
  outside the range of a C long) would produce a TypeError.

  Patch by Alexander Belopolsky (with minor modifications).
........
2010-05-07 13:23:18 +00:00
Senthil Kumaran cdf48a8ec2 Merged revisions 80908 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80908 | senthil.kumaran | 2010-05-07 09:37:29 +0530 (Fri, 07 May 2010) | 3 lines

  Testsuite for RFC3986 based parsing scenario. Related Issue1462525.
........
2010-05-07 04:15:56 +00:00
Benjamin Peterson 2f9134b11d Merged revisions 80894,80896 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80894 | benjamin.peterson | 2010-05-06 17:33:46 -0500 (Thu, 06 May 2010) | 1 line

  Availability gets its own line
........
  r80896 | benjamin.peterson | 2010-05-06 17:49:28 -0500 (Thu, 06 May 2010) | 1 line

  ensure that availability information is on its own line at the end of the function docs
........
2010-05-06 23:04:44 +00:00
Giampaolo Rodolà 902b57b6f6 Merged revisions 80875 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80875 | giampaolo.rodola | 2010-05-06 19:57:06 +0200 (gio, 06 mag 2010) | 1 line

  Fix asyncore issues 8573 and 8483: _strerror might throw ValueError; asyncore.__getattr__ cheap inheritance caused confusing error messages when accessing undefined class attributes; added an alias for __str__ which now is used as a fallback for __repr__
........
2010-05-06 18:24:02 +00:00
Antoine Pitrou 1222669b44 Issue #8629: Disable some test_ssl tests, since they give different
results with OpenSSL 1.0.0 and higher.
2010-05-06 13:49:10 +00:00
Brian Curtin a8538a504f Merged revisions 80857 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80857 | brian.curtin | 2010-05-05 21:54:44 -0500 (Wed, 05 May 2010) | 5 lines

  Fix #7863. Properly identify Windows 7 and Server 2008 R2.

  Removed various unused code and added a way to correctly determine
  server vs. workstation via the registry.
........
2010-05-06 03:01:55 +00:00
R. David Murray 3ce72a21c9 Blocked revisions 80849 via svnmerge
........
  r80849 | r.david.murray | 2010-05-05 20:59:04 -0400 (Wed, 05 May 2010) | 4 lines

  Have the serve.py script announce the directory it is
  serving and which port it is serving it on (I can
  never remember the default port number it uses...)
........
2010-05-06 01:06:27 +00:00
Victor Stinner 43cdd0ad34 Merged revisions 80844-80845 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80844 | victor.stinner | 2010-05-06 01:33:33 +0200 (jeu., 06 mai 2010) | 5 lines

  Untabify Modules/posixmodule.c

  Run Antoine Pitrou "untabify" script + manual editions (OS/2 and some
  continuation lines).
........
  r80845 | victor.stinner | 2010-05-06 02:03:44 +0200 (jeu., 06 mai 2010) | 4 lines

  Untabify Modules/posixmodule.c (2)

  Fix some more functions by hand
........
2010-05-06 00:20:44 +00:00
Tarek Ziadé 130e0b5fc1 Blocked revisions 80837 via svnmerge
........
  r80837 | tarek.ziade | 2010-05-06 00:41:25 +0200 (Thu, 06 May 2010) | 1 line

  removed non needed lines
........
2010-05-05 22:42:06 +00:00
Tarek Ziadé 06f78cd91e Merged revisions 80830 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80830 | tarek.ziade | 2010-05-06 00:15:31 +0200 (Thu, 06 May 2010) | 1 line

  Fixed #4265: shutil.copyfile() was leaking file descriptors when disk fills
........
2010-05-05 22:21:13 +00:00
Mark Dickinson 6bb7c4f2ef Merged revisions 80826 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80826 | mark.dickinson | 2010-05-05 22:52:39 +0100 (Wed, 05 May 2010) | 1 line

  Issue 8628: fix incorrect documentation for numbers.Complex.imag.
........
2010-05-05 21:53:32 +00:00
R. David Murray 8ff59b2f64 Blocked revisions 80800 via svnmerge
........
  r80800 | r.david.murray | 2010-05-05 13:31:03 -0400 (Wed, 05 May 2010) | 9 lines

  Issue #7472: remove unused code from email.encoders.encode_7or8bit.

  Yukihiro Nakadaira noticed a typo in encode_7or8bit that was trying
  to special case iso-2022 codecs.  It turns out that the code in
  question is never used, because whereas it was designed to trigger
  if the payload encoding was eight bit but its output encoding was
  7 bit, in practice the payload is always converted to the 7bit
  encoding before encode_7or8bit is called.  Patch by Shawat Anand.
........
2010-05-05 17:34:36 +00:00
Antoine Pitrou 657e5ac15a Merged revisions 80796 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80796 | antoine.pitrou | 2010-05-05 18:27:30 +0200 (mer., 05 mai 2010) | 3 lines

  Untabify Modules/_io/fileio.c
........
2010-05-05 16:29:25 +00:00
Antoine Pitrou 7fd622afd7 Merged revisions 80789 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80789 | antoine.pitrou | 2010-05-05 17:53:45 +0200 (mer., 05 mai 2010) | 3 lines

  Untabify Modules/_ssl.c
........
2010-05-05 15:59:19 +00:00
Ronald Oussoren 29c0fbc4f2 Merged revisions 80784 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80784 | ronald.oussoren | 2010-05-05 16:48:37 +0200 (Wed, 05 May 2010) | 9 lines

  The C function used by uuid.uuid4 is broken on
  OSX 10.6 in that after os.fork() the parent and
  child generate the same sequence of UUIDs.

  This patch falls back to the the Python implementation
  on OSX 10.6 or later.

  Fixes issue #8621.
........
2010-05-05 15:13:15 +00:00
Victor Stinner 7c8eaad1bf Merged revisions 80777 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80777 | victor.stinner | 2010-05-05 14:40:49 +0200 (mer., 05 mai 2010) | 3 lines

  Issue #8313: traceback.format_exception_only() encodes unicode message to
  ASCII with backslashreplace error handler if str(value) failed
........
2010-05-05 12:45:31 +00:00
Mark Dickinson 2dd131d535 Merged revisions 80762 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80762 | mark.dickinson | 2010-05-04 19:45:27 +0100 (Tue, 04 May 2010) | 3 lines

  Fix test_gzip failure on OS X.  The failure was a result of trying to fflush
  a file that wasn't open for writing.  Patch by Antoine Pitrou.
........
2010-05-04 18:46:24 +00:00
Mark Dickinson 1cdfa5f5bc Merged revisions 80753 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80753 | mark.dickinson | 2010-05-04 15:25:50 +0100 (Tue, 04 May 2010) | 10 lines

  Issue #8567: Fix incorrect precedence of signals in Decimal module.

  When a Decimal operation raises multiple signals and more than one of
  those signals is trapped, the specification determines the order in
  which the signals should be handled.  In many cases this order wasn't
  being followed, leading to the wrong Python exception being raised.
  This commit fixes those cases, and adds extra tests.  The tests are
  only enabled when EXTENDEDERRORTESTS is True, since they involve
  rerunning each Decimal testcase several times.
........
2010-05-04 14:30:32 +00:00
Antoine Pitrou 01a255add1 Merged revisions 80720 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80720 | antoine.pitrou | 2010-05-03 18:25:33 +0200 (lun., 03 mai 2010) | 5 lines

  Issue #7865: The close() method of :mod:`io` objects should not swallow
  exceptions raised by the implicit flush().  Also ensure that calling
  close() several times is supported.  Patch by Pascal Chambon.
........
2010-05-03 16:48:13 +00:00
Jesus Cea 2f49f4eb70 Merged revisions 80716 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80716 | jesus.cea | 2010-05-03 18:09:21 +0200 (Mon, 03 May 2010) | 1 line

  wbits negative was documented SEVEN years ago
........
2010-05-03 16:11:45 +00:00
Vinay Sajip c7cbb9b509 Issue #8581: logging: removed errors raised when closing handlers twice. 2010-05-03 15:39:57 +00:00
Antoine Pitrou 350c394c87 Merged revisions 80704 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80704 | antoine.pitrou | 2010-05-02 21:51:14 +0200 (dim., 02 mai 2010) | 4 lines

  Issue #4687: Fix accuracy of garbage collection runtimes displayed with
  gc.DEBUG_STATS.
........
2010-05-02 19:59:51 +00:00
Benjamin Peterson 697cd21665 Merged revisions 78962,78964 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78962 | benjamin.peterson | 2010-03-14 09:24:31 -0500 (Sun, 14 Mar 2010) | 1 line

  fix freebsd linking #7705
........
  r78964 | benjamin.peterson | 2010-03-14 10:06:14 -0500 (Sun, 14 Mar 2010) | 1 line

  fix quotes
........
2010-05-02 16:45:11 +00:00
Mark Dickinson c75375d561 Blocked revisions 80695 via svnmerge
........
  r80695 | mark.dickinson | 2010-05-02 10:38:43 +0100 (Sun, 02 May 2010) | 2 lines

  Improve error message from nb_int returning a non-integer, in various PyInt_As* functions:
........
2010-05-02 09:39:14 +00:00
Antoine Pitrou 73e97d8e21 Merged revisions 80690 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80690 | antoine.pitrou | 2010-05-01 22:26:58 +0200 (sam., 01 mai 2010) | 3 lines

  Remove duplicate test
........
2010-05-01 20:28:45 +00:00
Mark Dickinson 813f118157 Merged revisions 80681 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80681 | mark.dickinson | 2010-05-01 12:46:20 +0100 (Sat, 01 May 2010) | 2 lines

  Fix incorrect use of a list as the target of an 'except' clause in test_decimal.py.
........
2010-05-01 11:56:48 +00:00
Senthil Kumaran fcfd25bd72 Merged revisions 80675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80675 | senthil.kumaran | 2010-05-01 13:31:56 +0530 (Sat, 01 May 2010) | 3 lines

  Fix issue8582: urllib.urlretrieve fails with ValueError: Invalid format string
........
2010-05-01 08:06:38 +00:00