Commit Graph

1397 Commits

Author SHA1 Message Date
Victor Stinner ba9c6645f7 Issue #10419: Fix build_scripts command of distutils to handle correctly
non-ASCII scripts. Open and write the script in binary mode, but ensure that
the shebang is decodable from UTF-8 and from the encoding of the script.
2011-05-11 00:57:29 +02:00
Éric Araujo dcb22a3936 Fix resource warning found manually 2011-04-17 14:27:07 +02:00
Éric Araujo 691840f218 Fix improper tests in RegisterTestCase 2011-04-14 03:49:19 +02:00
Ezio Melotti 13925008dc #11565: Fix several typos. Patch by Piotr Kasprzyk. 2011-03-16 11:05:33 +02:00
Antoine Pitrou 2c50a09ac4 On behalf of Tarek: Issue #11501: disutils.archive_utils.make_zipfile no
longer fails if zlib is not installed. Instead, the zipfile.ZIP_STORED
compression is used to create the ZipFile. Patch by Natalia B. Bidart.
2011-03-15 21:02:59 +01:00
Éric Araujo b344dd06c8 Merged revisions 86236,86240,86332,86340,87271,87273,87447 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

The missing NEWS entries correspond to changes that were made before 3.1.3, but
I think it’s not usual to edit entries of released versions, so I put them at
the top.

........
  r86236 | eric.araujo | 2010-11-06 03:44:43 +0100 (sam., 06 nov. 2010) | 2 lines

  Make sure each test can be run standalone (./python Lib/distutils/tests/x.py)
........
  r86240 | eric.araujo | 2010-11-06 05:11:59 +0100 (sam., 06 nov. 2010) | 2 lines

  Prevent ResourceWarnings in test_gettext
........
  r86332 | eric.araujo | 2010-11-08 19:15:17 +0100 (lun., 08 nov. 2010) | 4 lines

  Add missing NEWS entry for a fix committed by Senthil.

  All recent modifications to distutils should now be covered in NEWS.
........
  r86340 | eric.araujo | 2010-11-08 22:48:23 +0100 (lun., 08 nov. 2010) | 2 lines

  This was actually fixed for the previous alpha.
........
  r87271 | eric.araujo | 2010-12-15 20:09:58 +0100 (mer., 15 déc. 2010) | 2 lines

  Improve trace documentation (#9264).  Patch by Eli Bendersky.
........
  r87273 | eric.araujo | 2010-12-15 20:30:15 +0100 (mer., 15 déc. 2010) | 2 lines

  Use nested method directives, rewrap long lines, fix whitespace.
........
  r87447 | eric.araujo | 2010-12-23 20:13:05 +0100 (jeu., 23 déc. 2010) | 2 lines

  Fix typo in superclass method name
........
2011-02-02 21:38:37 +00:00
Éric Araujo 5d899dddb2 Merged revisions 87280 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87280 | eric.araujo | 2010-12-15 22:07:22 +0100 (mer., 15 déc. 2010) | 2 lines

  Fix build_ext with VS 8.0.  Patch by Hirokazu Yamamoto (#9558).
........
2010-12-15 21:12:12 +00:00
Éric Araujo 7e2e321da3 Merged revisions 87277 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87277 | eric.araujo | 2010-12-15 21:26:30 +0100 (mer., 15 déc. 2010) | 2 lines

  Fix wrong name in docstring and doc (#10693).  Original patch by Eli Bendersky.
........
2010-12-15 20:30:51 +00:00
Benjamin Peterson 5757429130 3.1.3 final version bump 2010-11-27 14:46:13 +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 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
Benjamin Peterson 5889129571 bump to 3.1.3rc1 2010-11-13 17:28:56 +00:00
Éric Araujo c8267ead69 Merged revisions 86438 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86438 | eric.araujo | 2010-11-12 23:25:23 +0100 (ven., 12 nov. 2010) | 2 lines

  And now for something completely different: Finish fixing #10252 again.
........
2010-11-12 22:26:37 +00:00
Éric Araujo e84e72f95a Merged revisions 86274,86276 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86274 | eric.araujo | 2010-11-06 16:57:52 +0100 (sam., 06 nov. 2010) | 2 lines

  Correct the fix for #10252: Popen objects have no close method.
........
  r86276 | eric.araujo | 2010-11-06 19:03:52 +0100 (sam., 06 nov. 2010) | 2 lines

  Fix #10252 again (hopefully definitely).  Patch by Brian Curtin.
........
2010-11-12 20:27:45 +00:00
Éric Araujo 1ca7556dd0 Merged revisions 86244 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86244 | eric.araujo | 2010-11-06 05:48:05 +0100 (sam., 06 nov. 2010) | 3 lines

  Prevent race condition with mkdir in distutils.  Patch by Arfrever on #9281.
........
2010-11-06 04:51:10 +00:00
Éric Araujo c6d7ead095 Merged revisions 86223-86224,86226,86234 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86223 | eric.araujo | 2010-11-06 00:51:56 +0100 (sam., 06 nov. 2010) | 2 lines

  Always close files in distutils code and tests (#10252).
........
  r86224 | eric.araujo | 2010-11-06 00:58:34 +0100 (sam., 06 nov. 2010) | 2 lines

  Add missing entry for r86223.
........
  r86226 | eric.araujo | 2010-11-06 00:59:32 +0100 (sam., 06 nov. 2010) | 2 lines

  Of course, I forgot one file in r86223.
........
  r86234 | eric.araujo | 2010-11-06 03:10:32 +0100 (sam., 06 nov. 2010) | 2 lines

  Also close file descriptors from os.popen and subprocess.Popen
........
2010-11-06 02:58:56 +00:00
Antoine Pitrou ecdd08462a Should fix remaining 3.1 buildbot failure 2010-10-22 18:34:13 +00:00
Éric Araujo 8ad8039636 Backport fix for #10126 2010-10-21 18:46:36 +00:00
Georg Brandl 4009c9edfc Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r82805 | georg.brandl | 2010-07-11 11:42:10 +0200 (So, 11 Jul 2010) | 1 line

  #7935: cross-reference to ast.literal_eval() from eval() docs.
........
  r82806 | georg.brandl | 2010-07-11 12:22:44 +0200 (So, 11 Jul 2010) | 1 line

  #9223: link to Command class reference, and move Command interface docs nearer to class docs.
........
  r83523 | georg.brandl | 2010-08-02 14:06:18 +0200 (Mo, 02 Aug 2010) | 1 line

  #9209 and #7781: fix two crashes in pstats interactive browser.
........
  r83524 | georg.brandl | 2010-08-02 14:20:23 +0200 (Mo, 02 Aug 2010) | 1 line

  #9428: fix running scripts from profile/cProfile with their own name and the right namespace.  Same fix as for trace.py in #1690103.
........
  r83525 | georg.brandl | 2010-08-02 14:36:24 +0200 (Mo, 02 Aug 2010) | 1 line

  Get rid of spurious "threading" entries in trace output.
........
  r83526 | georg.brandl | 2010-08-02 14:40:22 +0200 (Mo, 02 Aug 2010) | 1 line

  Fix softspace relic.
........
  r83527 | georg.brandl | 2010-08-02 14:48:46 +0200 (Mo, 02 Aug 2010) | 1 line

  #3821: beginnings of a trace.py unittest.
........
  r83536 | georg.brandl | 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) | 1 line

  #8578: mention danger of not incref'ing weak referenced object.
........
  r83538 | georg.brandl | 2010-08-02 20:10:13 +0200 (Mo, 02 Aug 2010) | 1 line

  #6928: fix class docs w.r.t. new metaclasses.
........
  r83542 | georg.brandl | 2010-08-02 20:56:54 +0200 (Mo, 02 Aug 2010) | 1 line

  Move test_SimpleHTTPServer into test_httpservers.
........
  r83546 | georg.brandl | 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) | 1 line

  #7973: Fix distutils options spelling.
........
  r83547 | georg.brandl | 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) | 1 line

  #7386: add example that shows that trailing path separators are stripped.
........
  r83548 | georg.brandl | 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) | 1 line

  #8172: how does one use a property?
........
  r83550 | georg.brandl | 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) | 1 line

  #9451: strengthen warning about __*__ special name usage.
........
  r83551 | georg.brandl | 2010-08-02 21:35:06 +0200 (Mo, 02 Aug 2010) | 1 line

  Remove XXX comment that was displayed.
........
  r83552 | georg.brandl | 2010-08-02 21:36:36 +0200 (Mo, 02 Aug 2010) | 1 line

  #9438: clarify that constant names also cannot be assigned as attributes.
........
  r83553 | georg.brandl | 2010-08-02 21:39:17 +0200 (Mo, 02 Aug 2010) | 1 line

  Remove redundant information.
........
  r83554 | georg.brandl | 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) | 1 line

  #7280: note about nasmw.exe.
........
  r83555 | georg.brandl | 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) | 1 line

  #8861: remove unused variable.
........
  r83558 | georg.brandl | 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) | 1 line

  #8648: document UTF-7 codec functions.
........
  r83560 | georg.brandl | 2010-08-02 22:16:18 +0200 (Mo, 02 Aug 2010) | 1 line

  #9087: update json docstrings -- unicode and long do not exist anymore.
........
2010-10-06 08:26:09 +00:00
Tarek Ziadé c9afba853c Merged revisions 85197 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85197 | tarek.ziade | 2010-10-03 16:18:09 +0200 (Sun, 03 Oct 2010) | 1 line

  Fixed #8980: distutils.command.check was failing w/ docutils installed
........
2010-10-03 14:30:11 +00:00
Senthil Kumaran b1b6555244 Merged revisions 84889 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84889 | senthil.kumaran | 2010-09-19 08:39:54 +0530 (Sun, 19 Sep 2010) | 3 lines

  Update the test_distutils mode test to test with umask value properly.
........
2010-09-19 03:12:35 +00:00
Senthil Kumaran 107324cf7c Merged revisions 84871 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84871 | senthil.kumaran | 2010-09-18 08:25:03 +0530 (Sat, 18 Sep 2010) | 3 lines

  Skip the distutils mode test on Windows OS.
........
2010-09-18 02:57:28 +00:00
Senthil Kumaran d0ca013f25 Merged revisions 84861 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84861 | senthil.kumaran | 2010-09-17 22:05:37 +0530 (Fri, 17 Sep 2010) | 3 lines

  Fix Issue2236: Distutils' mkpath implementation ignoring the "mode" parameter
........
2010-09-17 16:42:05 +00:00
Hirokazu Yamamoto 67af7f4eee Merged revisions 84765 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84765 | hirokazu.yamamoto | 2010-09-13 16:18:30 +0900 | 2 lines

  get_build_version() is needed even where sys.platform != "win32".
  Try to fix buildbot error in other way.
........
2010-09-13 07:48:22 +00:00
Hirokazu Yamamoto 10f4f76b28 Merged revisions 84753,84760 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84753 | hirokazu.yamamoto | 2010-09-13 07:55:40 +0900 | 1 line

  Issue #9313: Skips test_remove_visual_c_ref on old MSVC.
........
  r84760 | hirokazu.yamamoto | 2010-09-13 14:36:21 +0900 | 1 line

  Issue #9313: Use unittest.skipUnless to skip old MSVC.
........
2010-09-13 05:48:30 +00:00
Éric Araujo 40f7e11f12 Merged revisions 84711 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84711 | eric.araujo | 2010-09-11 17:28:56 +0200 (sam., 11 sept. 2010) | 2 lines

  Fix typo in option name
........
2010-09-11 15:30:19 +00:00
Antoine Pitrou 80f45a0998 Merged revisions 84680 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84680 | antoine.pitrou | 2010-09-10 21:44:44 +0200 (ven., 10 sept. 2010) | 4 lines

  Issue #941346: Improve the build process under AIX and allow Python to
  be built as a shared library.  Patch by Sébastien Sablé.
........
2010-09-10 19:55:19 +00:00
Éric Araujo 5c46b14b30 Merged revisions 84614 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84614 | eric.araujo | 2010-09-08 02:00:45 +0200 (mer., 08 sept. 2010) | 5 lines

  Follow-up to #9199: Fix str.join use, add newlines.

  Thanks to Konrad Delong for writing a test for upload_docs
  --show-response in distutils2, letting me catch my mistake.
........
2010-09-08 00:02:00 +00:00
Éric Araujo a7851ca09d Merged revisions 84611 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84611 | eric.araujo | 2010-09-08 01:08:57 +0200 (mer., 08 sept. 2010) | 2 lines

  Fix incorrect use of Command.announce (#9199)
........
2010-09-07 23:09:44 +00:00
Éric Araujo 7cf83134f5 Merged revisions 84608 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84608 | eric.araujo | 2010-09-08 00:11:52 +0200 (mer., 08 sept. 2010) | 2 lines

  Fix eon-old bug in build_clib options (#1718574)
........
2010-09-07 22:17:04 +00:00
Éric Araujo 60a95b78b9 Merged revisions 83993 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83993 | eric.araujo | 2010-08-14 04:30:34 +0200 (sam., 14 août 2010) | 2 lines

  Use a marker in generated MANIFEST files, don't touch files without it. Fixes #8688.
........
2010-08-14 02:36:26 +00:00
Mark Dickinson 1f0f2785d9 Issue #8447: Make distutils.sysconfig follow symlinks in the path to
the interpreter executable.  This fixes a failure of test_httpservers
on OS X.
2010-08-03 21:33:04 +00:00
Georg Brandl caa78fee03 Merged revisions 83371,83390 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r83371 | georg.brandl | 2010-07-31 23:54:24 +0200 (Sa, 31 Jul 2010) | 1 line

  #8292: Fix three instances of truth tests on return values of filter() (which is always true in Python 3).
........
  r83390 | georg.brandl | 2010-08-01 10:07:49 +0200 (So, 01 Aug 2010) | 1 line

  #8230: make Lib/test/sortperf.py run on Python 3.
........
2010-08-01 19:07:28 +00:00
Ezio Melotti 5e74256619 Revert r82841. 2010-07-12 21:23:20 +00:00
Ezio Melotti f62637c32c Merged revisions 82839 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82839 | ezio.melotti | 2010-07-12 22:49:41 +0300 (Mon, 12 Jul 2010) | 1 line

  #6026: skip test_get_file_list when zlib is not available.
........
2010-07-12 20:00:39 +00:00
Ronald Oussoren 725443fef9 Fix for issue 9164 2010-07-11 09:29:09 +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
Benjamin Peterson 08cde2d0b1 Merged revisions 82131 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82131 | benjamin.peterson | 2010-06-21 10:37:16 -0500 (Mon, 21 Jun 2010) | 9 lines

  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
  ........
................
2010-06-21 15:42:48 +00:00
Ronald Oussoren d3f1503f32 Merged revisions 81673 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81673 | ronald.oussoren | 2010-06-03 16:42:25 +0200 (Thu, 03 Jun 2010) | 16 lines

  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.
  ........
................
2010-06-03 16:21:03 +00:00
Victor Stinner db19fb6bb1 Merged revisions 81359-81361 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81359 | victor.stinner | 2010-05-19 19:00:07 +0200 (mer., 19 mai 2010) | 4 lines

  Issue #8663: distutils.log emulates backslashreplace error handler. Fix
  compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if stdout
  is not a TTY).
........
  r81360 | victor.stinner | 2010-05-19 19:11:19 +0200 (mer., 19 mai 2010) | 5 lines

  regrtest.py: call replace_stdout() before the first call to print()

  print("==  ", os.getcwd()) fails if the current working directory is not ASCII
  whereas sys.stdout encoding is ASCII.
........
  r81361 | victor.stinner | 2010-05-19 19:15:50 +0200 (mer., 19 mai 2010) | 2 lines

  Oops, add the new test_log.py for distutils test suite (missing part of r81359)
........
2010-05-19 20:30:19 +00:00
Tarek Ziadé 42db5c3033 Merged revisions 81263 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81263 | tarek.ziade | 2010-05-17 13:01:57 +0200 (Mon, 17 May 2010) | 9 lines

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

  ........
    r81261 | tarek.ziade | 2010-05-17 12:54:43 +0200 (Mon, 17 May 2010) | 1 line

    upgraded distutils docs w.r.t. the manifest regeneration
  ........
................
2010-05-17 11:04:41 +00:00
Tarek Ziadé dd4671a93e Merged revisions 81258 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81258 | tarek.ziade | 2010-05-17 12:38:53 +0200 (Mon, 17 May 2010) | 9 lines

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

  ........
    r81255 | tarek.ziade | 2010-05-17 12:06:20 +0200 (Mon, 17 May 2010) | 1 line

    Fixed #8688: Distutils now recalculates MANIFEST everytime.
  ........
................
2010-05-17 10:48:29 +00:00
Benjamin Peterson f0fa1b2f67 version becomes 3.1.2 2010-03-20 20:47:27 +00:00
Tarek Ziadé 7c4afcb1c4 Fixed #2698 - now reads the compiler option when creating the compiler 2010-03-19 21:56:34 +00:00
Benjamin Peterson e4b56d2eee bump to 3.1.2rc1 2010-03-06 20:28:33 +00:00
Ronald Oussoren 93492334df Ensure that distutils.tests.test_util will pass in 64-bit builds.
Fixes #7591
2010-01-17 18:52:29 +00:00
Tarek Ziadé 343e2ff51b Merged revisions 77427 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77427 | tarek.ziade | 2010-01-12 00:15:52 +0100 (Tue, 12 Jan 2010) | 9 lines

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

  ........
    r77424 | tarek.ziade | 2010-01-11 23:50:29 +0100 (Mon, 11 Jan 2010) | 1 line

    Fixed #5372: .o files are now always rebuilt because file age test don't work in some case
  ........
................
2010-01-11 23:23:44 +00:00
Tarek Ziadé 5e9615fa60 Merged revisions 77380 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77380 | tarek.ziade | 2010-01-09 00:57:53 +0100 (Sat, 09 Jan 2010) | 9 lines

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

  ........
    r77377 | tarek.ziade | 2010-01-09 00:42:23 +0100 (Sat, 09 Jan 2010) | 1 line

    Fixed #7617: all flavors of gcc should be recognized now
  ........
................
2010-01-09 00:03:39 +00:00
Ronald Oussoren 38ce3de0f4 Merged revisions 77028 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77028 | ronald.oussoren | 2009-12-24 14:14:21 +0100 (Thu, 24 Dec 2009) | 15 lines

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

  ........
    r77026 | ronald.oussoren | 2009-12-24 14:06:39 +0100 (Thu, 24 Dec 2009) | 8 lines

    On OSX the output of "uname -m" always reflects the 32-bit architecture
    for the machine ("i386" or "ppc"), even if the executable is
    64-bit.

    This patchs ensures that the distutils platform architecture
    represents the architecture for the executable when running a
    64-bit only executable on OSX.
  ........
................
2009-12-24 13:16:53 +00:00
Tarek Ziadé b7e82bb7dd Merged revisions 76993-76994 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r76993 | tarek.ziade | 2009-12-22 00:12:41 +0100 (Tue, 22 Dec 2009) | 1 line

  Fixed #7556: editing the MSVC manifest file with a regexp was throwing an error
........
  r76994 | tarek.ziade | 2009-12-22 00:16:09 +0100 (Tue, 22 Dec 2009) | 1 line

  forgot to add the win32 test in the unittest skip call
........
2009-12-21 23:18:02 +00:00