Commit Graph

40803 Commits

Author SHA1 Message Date
Mark Dickinson 6f826469bb Temporary checkin to try to diagnose i386 Ubuntu buildbot failure. 2010-07-09 19:43:26 +00:00
Benjamin Peterson e0da9fcf06 3.x is the new trunk 2010-07-09 19:39:56 +00:00
R. David Murray ead883a366 Merged revisions 82730-82731 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82730 | r.david.murray | 2010-07-09 08:23:21 -0400 (Fri, 09 Jul 2010) | 4 lines

  7846: limit fnmatch pattern cache to _MAXCACHE=100 entries.

  Patch by Andrew Clegg.
........
  r82731 | r.david.murray | 2010-07-09 09:14:03 -0400 (Fri, 09 Jul 2010) | 2 lines

  Fix sort order mistake in Misc/ACKS.
........
2010-07-09 13:16:26 +00:00
Mark Dickinson 921d30d261 Merged revisions 82654 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82654 | mark.dickinson | 2010-07-08 22:15:36 +0100 (Thu, 08 Jul 2010) | 3 lines

  Issue #9136: Profiling Decimal gave 'dictionary changed size during iteration'.
  Remove the use of locals() that caused this error.
........
2010-07-08 21:18:21 +00:00
Mark Dickinson 0390f504ac Merged revisions 82646,82649-82650 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82646 | mark.dickinson | 2010-07-08 18:23:40 +0100 (Thu, 08 Jul 2010) | 1 line

  In test_decimal, convert heuristic for skipping tests into an explicit skiplist.
........
  r82649 | mark.dickinson | 2010-07-08 20:03:34 +0100 (Thu, 08 Jul 2010) | 1 line

  Fix a performance issue in Decimal.pow.  Thanks Stefan Krah for finding this.
........
  r82650 | mark.dickinson | 2010-07-08 20:09:16 +0100 (Thu, 08 Jul 2010) | 1 line

  Fix misplaced exactness check that was causing unnecessary work in Decimal.__pow__.
........
2010-07-08 19:21:59 +00:00
Ezio Melotti 1a1ea285f6 Blocked revisions 82644 via svnmerge
........
  r82644 | ezio.melotti | 2010-07-08 18:03:02 +0300 (Thu, 08 Jul 2010) | 1 line

  Fix typo in a comment in mathmodule.c.
........
2010-07-08 15:08:14 +00:00
Benjamin Peterson 003f523970 Merged revisions 82637 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82637 | benjamin.peterson | 2010-07-07 17:45:06 -0500 (Wed, 07 Jul 2010) | 1 line

  ValueError in this case is also acceptable
........
2010-07-07 22:50:58 +00:00
Benjamin Peterson f092c7c1d7 Merged revisions 82628,82630 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82628 | benjamin.peterson | 2010-07-07 13:44:05 -0500 (Wed, 07 Jul 2010) | 1 line

  this needn't be in the loop
........
  r82630 | benjamin.peterson | 2010-07-07 13:54:59 -0500 (Wed, 07 Jul 2010) | 1 line

  don't ignore exceptions from PyObject_IsTrue
........
2010-07-07 22:46:00 +00:00
Matthias Klose ddd46ceeb0 Remove whatsnew 2.7 item about --with-computed-gotos. 2010-07-07 11:06:57 +00:00
Alexander Belopolsky 1ab5db23a0 Blocked revisions 82617 via svnmerge
........
  r82617 | alexander.belopolsky | 2010-07-06 19:19:45 -0400 (Tue, 06 Jul 2010) | 1 line

  Issue #9000: datetime.timezone objects now have eval-friendly repr.
........
2010-07-06 23:26:35 +00:00
Alexander Belopolsky be140696de Blocked revisions 82514 via svnmerge
........
  r82514 | alexander.belopolsky | 2010-07-03 16:35:53 -0400 (Sat, 03 Jul 2010) | 3 lines

  Issue #9094: Make python -m pickletools disassemble pickles given in
  the command line.
........
2010-07-06 18:31:05 +00:00
Senthil Kumaran 317ac619a2 Merged revisions 82601 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82601 | senthil.kumaran | 2010-07-06 07:38:36 +0530 (Tue, 06 Jul 2010) | 3 lines

  Change 'lowered' to 'lowercased'
........
2010-07-06 03:03:34 +00:00
Victor Stinner d64ce7be96 Merged revisions 82597 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82597 | victor.stinner | 2010-07-05 23:36:21 +0200 (lun., 05 juil. 2010) | 2 lines

  #9158: Fix y* format of PyArg_Parse*() functions documentation
........
2010-07-05 21:38:37 +00:00
Alexander Belopolsky f5c7bc841b Merged revisions 82578 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82578 | alexander.belopolsky | 2010-07-05 11:05:33 -0400 (Mon, 05 Jul 2010) | 1 line

  Added more tests for utctimetuple()
........
2010-07-05 15:26:36 +00:00
Senthil Kumaran 74ceac2306 Merged revisions 82573 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82573 | senthil.kumaran | 2010-07-05 17:30:56 +0530 (Mon, 05 Jul 2010) | 3 lines

  Fix the docstrings of the capitalize method.
........
2010-07-05 12:04:23 +00:00
Senthil Kumaran 3592a46c4d Merged revisions 82570 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82570 | senthil.kumaran | 2010-07-05 17:11:42 +0530 (Mon, 05 Jul 2010) | 3 lines

  Fix: Issue9091 Minor documentation clarification.
........
2010-07-05 11:44:49 +00:00
Mark Dickinson 0dce815c2b Merged revisions 82555 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82555 | mark.dickinson | 2010-07-04 19:38:57 +0100 (Sun, 04 Jul 2010) | 2 lines

  Issue #9130: Validate ellipsis tokens in relative imports.
........
2010-07-04 18:39:48 +00:00
Mark Dickinson 1b9b5727cc Merged revisions 82552-82553 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82552 | mark.dickinson | 2010-07-04 19:11:51 +0100 (Sun, 04 Jul 2010) | 2 lines

  Issue #9130: Fix validation of relative imports in parser module.
........
  r82553 | mark.dickinson | 2010-07-04 19:15:26 +0100 (Sun, 04 Jul 2010) | 1 line

  Fix symbol numbers in test_parser test.
........
2010-07-04 18:16:43 +00:00
Georg Brandl 31a0f86e36 Merged revisions 77316 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r77316 | georg.brandl | 2010-01-05 11:22:04 +0100 (Di, 05 Jan 2010) | 1 line

  Assorted doc fixes by Florent.
........
2010-07-04 17:33:33 +00:00
Benjamin Peterson 1b84b5fd64 Merged revisions 82542 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82542 | benjamin.peterson | 2010-07-04 11:44:15 -0500 (Sun, 04 Jul 2010) | 17 lines

  Merged revisions 81478,82530-82531 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r81478 | benjamin.peterson | 2010-05-22 13:47:39 -0500 (Sat, 22 May 2010) | 1 line

    ensure doctests have some future_features
  ........
    r82530 | benjamin.peterson | 2010-07-04 11:11:41 -0500 (Sun, 04 Jul 2010) | 1 line

    simplify ignore star imports from itertools #8892
  ........
    r82531 | benjamin.peterson | 2010-07-04 11:13:20 -0500 (Sun, 04 Jul 2010) | 1 line

    wrap with parenthesis not \
  ........
................
2010-07-04 16:49:46 +00:00
Mark Dickinson a441e6465a Merged revisions 82537 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82537 | mark.dickinson | 2010-07-04 17:37:31 +0100 (Sun, 04 Jul 2010) | 2 lines

  Issue #9128: Fix validation of class decorators in parser module.
........
2010-07-04 16:39:03 +00:00
Alexander Belopolsky 775695ad03 Merged revisions 82533 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82533 | alexander.belopolsky | 2010-07-04 12:28:08 -0400 (Sun, 04 Jul 2010) | 1 line

  Issue #9152: Removed dead code in datetime module
........
2010-07-04 16:33:25 +00:00
Mark Dickinson 874135b9ae Merged revisions 82527 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82527 | mark.dickinson | 2010-07-04 11:15:11 +0100 (Sun, 04 Jul 2010) | 1 line

  Fix refleak in Modules/audioop.c.
........
2010-07-04 10:15:59 +00:00
Senthil Kumaran 8d386873c2 Minor change in the wording. 2010-07-03 18:04:31 +00:00
Senthil Kumaran fe1ad15b4b Merged revisions 82510 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82510 | senthil.kumaran | 2010-07-03 23:18:22 +0530 (Sat, 03 Jul 2010) | 4 lines

  Fix Issue5468 - urlencode to handle bytes and other alternate encodings.
  (Extensive tests provided). Patch by Dan Mahn.
........
2010-07-03 17:55:41 +00:00
Victor Stinner 8e42fb7ada Merged revisions 82495 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82495 | victor.stinner | 2010-07-03 15:44:22 +0200 (sam., 03 juil. 2010) | 10 lines

  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
  ........
................
2010-07-03 13:46:01 +00:00
Mark Dickinson f78756a8a8 Merged revisions 82478 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82478 | mark.dickinson | 2010-07-03 10:17:16 +0100 (Sat, 03 Jul 2010) | 9 lines

  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.
  ........
................
2010-07-03 09:18:26 +00:00
Ezio Melotti 25bc019d46 Merged revisions 82413,82468 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82413 | ezio.melotti | 2010-07-01 10:32:02 +0300 (Thu, 01 Jul 2010) | 13 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) Change the error messages "unexpected code byte" to "invalid start byte"
     and "invalid data" to "invalid continuation byte";
  4) Add an extensive set of tests in test_unicode;
  5) Fix test_codeccallbacks because it was failing after this change.
........
  r82468 | ezio.melotti | 2010-07-03 07:52:19 +0300 (Sat, 03 Jul 2010) | 1 line

  Update comment about surrogates.
........
2010-07-03 05:18:50 +00:00
Ezio Melotti 795b8e3f13 Merged revisions 82462 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82462 | ezio.melotti | 2010-07-03 02:18:51 +0300 (Sat, 03 Jul 2010) | 17 lines

  Merged revisions 82455,82457,82459 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82455 | eric.smith | 2010-07-03 00:44:16 +0300 (Sat, 03 Jul 2010) | 1 line

    Moved period outside paren, where it belongs.
  ........
    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.
  ........
................
2010-07-02 23:22:03 +00:00
Mark Dickinson 769089294a Merged revisions 82452 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82452 | mark.dickinson | 2010-07-02 21:26:07 +0100 (Fri, 02 Jul 2010) | 9 lines

  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.
  ........
................
2010-07-02 20:26:51 +00:00
Benjamin Peterson 1ed6670055 Merged revisions 82448 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82448 | benjamin.peterson | 2010-07-02 14:45:07 -0500 (Fri, 02 Jul 2010) | 9 lines

  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
  ........
................
2010-07-02 19:50:16 +00:00
Nick Coghlan 51e38db84c Blocked revisions 82440,82443 via svnmerge
................
  r82440 | nick.coghlan | 2010-07-03 01:57:50 +1000 (Sat, 03 Jul 2010) | 9 lines

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

  ........
    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
  ........
................
  r82443 | nick.coghlan | 2010-07-03 02:14:05 +1000 (Sat, 03 Jul 2010) | 9 lines

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

  ........
    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
  ........
................
2010-07-02 16:21:37 +00:00
Benjamin Peterson d793847608 Merged revisions 82422 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82422 | benjamin.peterson | 2010-07-01 12:49:01 -0500 (Thu, 01 Jul 2010) | 9 lines

  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
  ........
................
2010-07-01 17:51:42 +00:00
Giampaolo Rodolà d68ed93824 Merged revisions 82407 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82407 | giampaolo.rodola | 2010-06-30 19:47:39 +0200 (mer, 30 giu 2010) | 9 lines

  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
  ........
................
2010-06-30 17:50:20 +00:00
Mark Dickinson bf9f79b185 Tests for Python 3.1's treatment of negated imaginary literals. 2010-06-30 10:55:51 +00:00
Mark Dickinson ce5b6c43bf Revert r82044, since it changed the semantics of negated imaginary literals.
Before r82044, '-7j' became complex(0.0, -7.0);  afterwards it was
complex(-0.0, -7.0).  See issue 9011.
2010-06-30 10:34:53 +00:00
Mark Dickinson 881c1b4c10 Merged revisions 82381 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82381 | mark.dickinson | 2010-06-29 21:10:42 +0100 (Tue, 29 Jun 2010) | 9 lines

  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.
  ........
................
2010-06-29 20:11:18 +00:00
Benjamin Peterson f6f3f53714 Merged revisions 82376 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82376 | benjamin.peterson | 2010-06-29 13:36:39 -0500 (Tue, 29 Jun 2010) | 1 line

  update for nonlocal keyword
........
2010-06-29 18:40:09 +00:00
Benjamin Peterson acf16deeb8 Merged revisions 82373 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82373 | benjamin.peterson | 2010-06-29 10:57:57 -0500 (Tue, 29 Jun 2010) | 1 line

  note that byte strings can be raw, too #9114
........
2010-06-29 16:04:46 +00:00
Benjamin Peterson 714b74d39f Merged revisions 82354 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82354 | benjamin.peterson | 2010-06-28 20:27:35 -0500 (Mon, 28 Jun 2010) | 1 line

  rephrase and remove uneeded statement
........
2010-06-29 01:30:28 +00:00
Brian Curtin 5f6b4a53c2 Merged revisions 82351 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82351 | brian.curtin | 2010-06-28 19:14:28 -0500 (Mon, 28 Jun 2010) | 3 lines

  Update md5driver.py for 3.x.
  Changed an import, replaced md5.new() with md5(), and added an encode where needed.
........
2010-06-29 00:17:01 +00:00
Benjamin Peterson 26eb9d0b47 Merged revisions 82342 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82342 | benjamin.peterson | 2010-06-28 14:43:42 -0500 (Mon, 28 Jun 2010) | 1 line

  update error message
........
2010-06-28 19:46:35 +00:00
Senthil Kumaran 783df8d491 Merged revisions 82336 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82336 | senthil.kumaran | 2010-06-28 23:01:40 +0530 (Mon, 28 Jun 2010) | 9 lines

  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.
  ........
................
2010-06-28 17:35:17 +00:00
Alexander Belopolsky 6b131cb110 Blocked revisions 82328 via svnmerge
........
  r82328 | alexander.belopolsky | 2010-06-28 10:36:55 -0400 (Mon, 28 Jun 2010) | 1 line

  Added missing white space
........
2010-06-28 14:38:44 +00:00
Senthil Kumaran 930049bda9 Merged revisions 82326 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82326 | senthil.kumaran | 2010-06-28 19:38:00 +0530 (Mon, 28 Jun 2010) | 9 lines

  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.
  ........
................
2010-06-28 14:12:18 +00:00
Ronald Oussoren ddb62e9f4c Merged revisions 82286 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82286 | ronald.oussoren | 2010-06-27 16:26:30 +0200 (Sun, 27 Jun 2010) | 11 lines

  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.
  ........
................
2010-06-27 14:27:27 +00:00
Ronald Oussoren 536ad94edb Merged revisions 82281 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82281 | ronald.oussoren | 2010-06-27 14:51:31 +0200 (Sun, 27 Jun 2010) | 19 lines

  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).
  ........
................
2010-06-27 12:52:17 +00:00
Ronald Oussoren a75facfdc7 Merged revisions 82278 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82278 | ronald.oussoren | 2010-06-27 14:45:47 +0200 (Sun, 27 Jun 2010) | 12 lines

  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.
  ........
................
2010-06-27 12:46:19 +00:00
Ronald Oussoren 0f2985c1c2 Merged revisions 82273 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82273 | ronald.oussoren | 2010-06-27 14:37:46 +0200 (Sun, 27 Jun 2010) | 15 lines

  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.
  ........
................
2010-06-27 12:40:35 +00:00
Georg Brandl 525201a08c Fix duplicate paragraph. 2010-06-27 10:57:33 +00:00