Commit Graph

40557 Commits

Author SHA1 Message Date
Benjamin Peterson ffa94b0f02 Merged revisions 77102 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r77102 | benjamin.peterson | 2009-12-28 17:50:41 -0600 (Mon, 28 Dec 2009) | 50 lines

  Merged revisions 76871-76872,77093-77095,77097-77101 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r76871 | benjamin.peterson | 2009-12-17 20:49:21 -0600 (Thu, 17 Dec 2009) | 1 line

    handle unencodable diffs gracefully #5093
  ........
    r76872 | benjamin.peterson | 2009-12-17 20:51:37 -0600 (Thu, 17 Dec 2009) | 1 line

    fix emacs header
  ........
    r77093 | benjamin.peterson | 2009-12-28 14:43:32 -0600 (Mon, 28 Dec 2009) | 7 lines

    replace callable(x) with isinstance(x, collections.Callable) #7006

    This is a more accurate translation than hasattr(x, '__call__') which failed in
    the case that somebody had put __call__ in the instance dictionary.

    Patch mostly by Joe Amenta.
  ........
    r77094 | benjamin.peterson | 2009-12-28 14:45:13 -0600 (Mon, 28 Dec 2009) | 2 lines

    deuglify imports
  ........
    r77095 | benjamin.peterson | 2009-12-28 14:49:23 -0600 (Mon, 28 Dec 2009) | 1 line

    remove unused flag
  ........
    r77097 | benjamin.peterson | 2009-12-28 16:12:13 -0600 (Mon, 28 Dec 2009) | 2 lines

    clean up imports and whitespace
  ........
    r77098 | benjamin.peterson | 2009-12-28 16:43:35 -0600 (Mon, 28 Dec 2009) | 1 line

    *** empty log message ***
  ........
    r77099 | benjamin.peterson | 2009-12-28 16:45:10 -0600 (Mon, 28 Dec 2009) | 1 line

    revert unintended change
  ........
    r77100 | benjamin.peterson | 2009-12-28 16:53:21 -0600 (Mon, 28 Dec 2009) | 1 line

    revert unintended changes
  ........
    r77101 | benjamin.peterson | 2009-12-28 17:46:02 -0600 (Mon, 28 Dec 2009) | 1 line

    normalize whitespace
  ........
................
2009-12-29 00:06:20 +00:00
Georg Brandl 1e28a27f84 Merged revisions 77088 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77088 | georg.brandl | 2009-12-28 09:34:58 +0100 (Mo, 28 Dez 2009) | 1 line

  #7033: add new API function PyErr_NewExceptionWithDoc, for easily giving new exceptions a docstring.
........
2009-12-28 08:41:01 +00:00
Georg Brandl 127d47092a Recorded merge of revisions 77086 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77086 | georg.brandl | 2009-12-28 09:09:32 +0100 (Mo, 28 Dez 2009) | 1 line

  #7381: consistency update, and backport avoiding ``None >= 0`` check from py3k.
........
2009-12-28 08:10:38 +00:00
Georg Brandl af5c238746 Merged revisions 77084 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77084 | georg.brandl | 2009-12-28 09:01:59 +0100 (Mo, 28 Dez 2009) | 1 line

  #7586: fix typo.
........
2009-12-28 08:02:38 +00:00
Georg Brandl 8668c22144 Merged revisions 77081 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77081 | georg.brandl | 2009-12-28 08:59:05 +0100 (Mo, 28 Dez 2009) | 1 line

  #7577: fix signature of PyBuffer_FillInfo().
........
2009-12-28 08:00:47 +00:00
Georg Brandl 27277d9d5b #7577: fix signature info for getbufferproc. 2009-12-28 07:59:20 +00:00
Mark Dickinson 2cfda806f8 Merged revisions 77071 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77071 | mark.dickinson | 2009-12-27 21:31:50 +0000 (Sun, 27 Dec 2009) | 1 line

  Use a more idiomatic check in check_truediv.
........
2009-12-27 21:34:05 +00:00
Mark Dickinson a4e1506e7f Merged revisions 77066 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77066 | mark.dickinson | 2009-12-27 16:16:02 +0000 (Sun, 27 Dec 2009) | 1 line

  Use ldexp(q, exp) instead of q*2.**exp in true division test, to avoid bogus failures on platforms with broken pow (e.g., Ubuntu/ia64).
........
2009-12-27 19:03:31 +00:00
Mark Dickinson cbb62745ac Merged revisions 77062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77062 | mark.dickinson | 2009-12-27 14:55:57 +0000 (Sun, 27 Dec 2009) | 2 lines

  Issue #1811:  Improve accuracy and consistency of true division for integers.
........
2009-12-27 15:09:50 +00:00
Senthil Kumaran 99b2c8f811 Merged revisions 77058 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77058 | senthil.kumaran | 2009-12-27 14:41:09 +0530 (Sun, 27 Dec 2009) | 4 lines

  Fix for issue5625 - test_urllib2 fails - urlopen error file not on local host.
  This is on hosts with multiple ip addresses.
........
2009-12-27 10:13:39 +00:00
Ronald Oussoren 54ad07e999 Fix merge issue where I forgot to replace sys.maxint by sys.maxsize. 2009-12-26 13:16:15 +00:00
Ezio Melotti 0ba511d276 Merged revisions 77050 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77050 | ezio.melotti | 2009-12-25 04:12:01 +0200 (Fri, 25 Dec 2009) | 1 line

  Updated sys.flags table in Doc
........
2009-12-25 02:16:56 +00:00
Ezio Melotti 08615c8337 Blocked revisions 77045 via svnmerge
........
  r77045 | ezio.melotti | 2009-12-25 00:25:17 +0200 (Fri, 25 Dec 2009) | 1 line

  #6108: unicode(exception) and str(exception) should return the same message
........
2009-12-24 23:01:34 +00:00
Ezio Melotti 2f5a78c5fd Remove test for unicode(e) converted to str(e) by 2to3 2009-12-24 22:54:06 +00:00
Mark Dickinson 8ae535bac7 Merged revisions 77041 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77041 | mark.dickinson | 2009-12-24 16:06:58 +0000 (Thu, 24 Dec 2009) | 1 line

  Issue #7568:  typo in docstring.  Thanks Mike Putnam.
........
2009-12-24 16:12:49 +00:00
Benjamin Peterson 9429a4ca6c Blocked revisions 77038 via svnmerge
........
  r77038 | benjamin.peterson | 2009-12-24 09:19:40 -0600 (Thu, 24 Dec 2009) | 1 line

  allow Process name to be unicode #7571
........
2009-12-24 15:21:26 +00:00
Ronald Oussoren 585c1733c8 Merged revisions 77033 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77033 | ronald.oussoren | 2009-12-24 15:17:19 +0100 (Thu, 24 Dec 2009) | 2 lines

  Fix for issue #7541: python-config --ldflags doesn't pick up libpython2.5.a
........
2009-12-24 14:21:55 +00:00
Ronald Oussoren 6f6c562492 Merged revisions 77031 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77031 | ronald.oussoren | 2009-12-24 14:30:58 +0100 (Thu, 24 Dec 2009) | 15 lines

  Issue #6834: replace the implementation for the 'python' and 'pythonw' executables on OSX.

  The previous implementation used execv(2) to run the real interpreter, which means that
  you cannot use the arch(1) tool to select the architecture you want to use for a
  universal build because that only affects the python/pythonw wrapper and not the actual
  interpreter.

  The new version uses posix_spawnv with a number of OSX-specific options that ensure that
  the real interpreter is started using the same CPU architecture as the wrapper, and that
  means that 'arch -ppc python' now actually works.

  I've also changed the way that the wrapper looks for the framework: it is now linked to
  the framework rather than hardcoding the framework path. This should make it easier to
  provide pythonw support in tools like virtualenv.
........
2009-12-24 14:03:19 +00:00
Ronald Oussoren ecc6081b3e 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:14:21 +00:00
Ezio Melotti 579c29be27 Merged revisions 77022 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77022 | ezio.melotti | 2009-12-24 04:54:53 +0200 (Thu, 24 Dec 2009) | 1 line

  Added markup and default arg, fixed example
........
2009-12-24 03:23:23 +00:00
Senthil Kumaran 037f836b27 Merged revisions 77018 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77018 | senthil.kumaran | 2009-12-24 07:48:14 +0530 (Thu, 24 Dec 2009) | 3 lines

  Fix for Issue7570: Error in urllib2 example.
........
2009-12-24 02:24:37 +00:00
Benjamin Peterson 3d5b8db049 Merged revisions 77014 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77014 | benjamin.peterson | 2009-12-23 19:09:53 -0600 (Wed, 23 Dec 2009) | 1 line

  fix alleged refleak
........
2009-12-24 01:14:05 +00:00
Ezio Melotti 6628a10034 Rephrased the introduction, added missing commas and my name for Unicode 2009-12-23 20:56:09 +00:00
Georg Brandl 5e8f6d17e9 #7417: add signature to open() docstring. 2009-12-23 10:30:45 +00:00
Martin v. Löwis e5692cdaae Merged revisions 76990-76991 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76990 | martin.v.loewis | 2009-12-21 20:27:15 +0100 (Mo, 21 Dez 2009) | 1 line

  Switch to OpenSSL 0.9.8l.
........
  r76991 | martin.v.loewis | 2009-12-21 20:29:59 +0100 (Mo, 21 Dez 2009) | 1 line

  Add NEWS for OpenSSL changes.
........
2009-12-22 08:57:39 +00:00
Martin v. Löwis b90535f220 Merged revisions 76989 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76989 | martin.v.loewis | 2009-12-21 20:25:56 +0100 (Mo, 21 Dez 2009) | 1 line

  Drop 2.4 compatibility.
........
2009-12-22 08:54:52 +00:00
Tarek Ziadé 65ff07b548 Blocked revisions 76998 via svnmerge
........
  r76998 | tarek.ziade | 2009-12-22 00:37:44 +0100 (Tue, 22 Dec 2009) | 1 line

  added a note about #7556 in Misc/NEWS
........
2009-12-21 23:39:47 +00:00
Tarek Ziadé 95ccac776d forgot to add the win32 test in the unittest skip call 2009-12-21 23:16:09 +00:00
Tarek Ziadé c60ea329a4 Fixed #7556: editing the MSVC manifest file with a regexp was throwing an error 2009-12-21 23:12:41 +00:00
Mark Dickinson 036dd31f88 Blocked revisions 76984 via svnmerge
........
  r76984 | mark.dickinson | 2009-12-21 16:29:21 +0000 (Mon, 21 Dec 2009) | 3 lines

  Issue #7553:  test_long_future wasn't testing properly.  Thanks Florent Xicluna
  for bug report and patch.
........
2009-12-21 16:30:51 +00:00
Mark Dickinson 82ebc1fde7 Merged revisions 76982 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76982 | mark.dickinson | 2009-12-21 15:40:33 +0000 (Mon, 21 Dec 2009) | 2 lines

  Inverse hyperbolic trigonometric functions should call m_log1p, not log1p.
........
2009-12-21 15:42:00 +00:00
Mark Dickinson f371859a4f Merged revisions 76978 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76978 | mark.dickinson | 2009-12-21 15:22:00 +0000 (Mon, 21 Dec 2009) | 3 lines

  Issue #7518:  Move substitute definitions of C99 math functions from
  pymath.c to Modules/_math.c.
........
2009-12-21 15:27:41 +00:00
R. David Murray 0f72d6c25f Merged revisions 76973 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76973 | r.david.murray | 2009-12-21 07:45:41 -0500 (Mon, 21 Dec 2009) | 2 lines

  Remove a leftover from a previous iteration of the issue 7376 patch.
........
2009-12-21 12:50:02 +00:00
Mark Dickinson 309aa2dcb4 Keep PyLong_AsLongAndOverflow documentation and implementation in sync
between py3k and trunk;  merge new tests from trunk to py3k.
(See issue #7528.)
2009-12-21 12:37:06 +00:00
Mark Dickinson 6193aeee32 Blocked revisions 76967-76968 via svnmerge
........
  r76967 | mark.dickinson | 2009-12-21 11:31:54 +0000 (Mon, 21 Dec 2009) | 1 line

  Fix reference counts for test_long_and_overflow.
........
  r76968 | mark.dickinson | 2009-12-21 12:15:48 +0000 (Mon, 21 Dec 2009) | 1 line

  Additional edge-case tests for test_long_and_overflow.
........
2009-12-21 12:18:09 +00:00
Mark Dickinson 64d78dc381 Blocked revisions 76963 via svnmerge
........
  r76963 | mark.dickinson | 2009-12-21 11:21:25 +0000 (Mon, 21 Dec 2009) | 3 lines

  Issue #7528:  Backport PyLong_AsLongAndOverflow from py3k to trunk.
  Thanks Case Van Horsen for the patch.
........
2009-12-21 11:22:47 +00:00
Tarek Ziadé 88e2c5d35a Merged revisions 76956 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76956 | tarek.ziade | 2009-12-21 02:22:46 +0100 (Mon, 21 Dec 2009) | 1 line

  massive import cleaning in Distutils
........
2009-12-21 01:49:00 +00:00
Tarek Ziadé 8b9361a26d Merged revisions 76952 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76952 | tarek.ziade | 2009-12-21 00:23:34 +0100 (Mon, 21 Dec 2009) | 1 line

  Fixed #7552: fixed distutils.command.upload failure on very long passwords
........
2009-12-21 00:02:20 +00:00
Mark Dickinson 4d1e50dc6f Merged revisions 76948 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76948 | mark.dickinson | 2009-12-20 20:34:44 +0000 (Sun, 20 Dec 2009) | 3 lines

  Issue #7554:  Various fixups in test_cmath.py:  remove code duplication,
  use new-style formatting.  Thanks Florent Xicluna for the patch.
........
2009-12-20 20:37:56 +00:00
Mark Dickinson 8978b8d227 Blocked revisions 76945 via svnmerge
........
  r76945 | mark.dickinson | 2009-12-20 20:23:01 +0000 (Sun, 20 Dec 2009) | 1 line

  Silence -3 warnings.  Thanks Florent Xicluna.
........
2009-12-20 20:24:18 +00:00
Mark Dickinson da89245c0b Merged revisions 76939,76941 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76939 | mark.dickinson | 2009-12-20 19:45:37 +0000 (Sun, 20 Dec 2009) | 1 line

  Issue #7554:  Fix incorrect usage of rAssertAlmostEqual.  Thanks Florent Xicluna.
........
  r76941 | mark.dickinson | 2009-12-20 19:52:36 +0000 (Sun, 20 Dec 2009) | 1 line

  Fix for consistency with py3k keyword-only version of assertAlmostEqual
........
2009-12-20 19:56:09 +00:00
R. David Murray 445448ca2d Merged revisions 76934-76935 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76934 | r.david.murray | 2009-12-20 11:24:46 -0500 (Sun, 20 Dec 2009) | 2 lines

  Fix comment typo.
........
  r76935 | r.david.murray | 2009-12-20 11:46:06 -0500 (Sun, 20 Dec 2009) | 10 lines

  Issue #7376: When called with no arguments doctest was running a
  self-test.  Because of a change to the way tracebacks are printed,
  this self-test was failing.  The test is run (and passes) during normal
  regression testing.  So instead of running the failing self-test this
  patch makes doctest emit a usage message.  This is better behavior anyway
  since passing in arguments is the real reason to run doctest as a command.

  Bug discovery and initial patch by Florent Xicluna.
........
2009-12-20 17:28:31 +00:00
Mark Dickinson 1554b18b5a Merged revisions 76930 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76930 | mark.dickinson | 2009-12-20 15:57:56 +0000 (Sun, 20 Dec 2009) | 1 line

  Add missing tests for PyArg_Parse* with format 'h'
........
2009-12-20 16:03:30 +00:00
Benjamin Peterson 808ff2c9d1 Blocked revisions 76927 via svnmerge
........
  r76927 | benjamin.peterson | 2009-12-20 09:23:22 -0600 (Sun, 20 Dec 2009) | 1 line

  builtin-ins -> builtins
........
2009-12-20 15:24:32 +00:00
Georg Brandl 2708f3a53a Recorded merge of revisions 76925 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76925 | georg.brandl | 2009-12-20 15:33:20 +0100 (So, 20 Dez 2009) | 1 line

  #7381: subprocess documentation and library docstring consistency fixes.
........
2009-12-20 14:38:23 +00:00
Georg Brandl 99de488949 #7493: more review fixes. 2009-12-20 14:24:06 +00:00
Georg Brandl 11b636291a #7495: more review fixes. 2009-12-20 14:21:27 +00:00
Georg Brandl 14278694dd Blocked revisions 76920 via svnmerge
........
  r76920 | georg.brandl | 2009-12-20 15:20:16 +0100 (So, 20 Dez 2009) | 1 line

  #7495: backport Programming FAQ review to trunk.
........
2009-12-20 14:20:59 +00:00
Mark Dickinson da39dbffb6 Merged revisions 76916 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76916 | mark.dickinson | 2009-12-20 13:58:18 +0000 (Sun, 20 Dec 2009) | 3 lines

  math.factorial depends on PyLong_AsLong correctly converting floats; rewrite
  it to do the conversion explicitly instead.  See issue #7550.
........
2009-12-20 14:07:47 +00:00
Ezio Melotti a8f6f1e2d6 Fixed capitalization and markup; added imports in the example 2009-12-20 12:24:57 +00:00