Commit Graph

36220 Commits

Author SHA1 Message Date
Alexandre Vassalotti 14a767d4f4 Made the TypeError message in bytes_iconcat() less confusing.
Before this change, the following example would output:

  >>> b = bytearray(b"hello")
  >>> b += "world"
  Traceback (most recent call last):
    File "<stdin>", line 1, in <module>
  TypeError: can't concat bytes to bytearray
2008-05-09 19:50:27 +00:00
Martin v. Löwis b2289ec60c Merged revisions 62946 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62946 | martin.v.loewis | 2008-05-09 19:11:07 +0200 (Fr, 09 Mai 2008) | 1 line

  Add 2.6b1 and 2.6b2 UUIDs.
........
2008-05-09 17:14:15 +00:00
Martin v. Löwis 66834fd078 Use UNICODE wWinMain, to make CRT initialize __wargv. 2008-05-09 17:06:49 +00:00
Mark Dickinson b134227737 block r62943 2008-05-09 16:16:28 +00:00
Mark Dickinson b63aff15e8 Revert the temporary change in r62624 2008-05-09 14:10:27 +00:00
Mark Dickinson c4352b061a Issue 2801: fix bug in float.is_integer where ValueError was incorrectly
raised.
2008-05-09 13:55:01 +00:00
Mark Dickinson b27406c03e Issue 2748: fix __ceil__, __floor__ and __round__ magic methods in
Decimal, and add tests.
2008-05-09 13:42:33 +00:00
Brett Cannon 97371eb1ad Blocked revisions 62923 via svnmerge
........
  r62923 | brett.cannon | 2008-05-08 22:32:42 -0700 (Thu, 08 May 2008) | 2 lines

  Deprecate the toaiff module for removal in 3.0.
........
2008-05-09 05:33:23 +00:00
Brett Cannon bd898605a9 Blocked revisions 62920 via svnmerge
........
  r62920 | brett.cannon | 2008-05-08 22:25:37 -0700 (Thu, 08 May 2008) | 2 lines

  Deprecate test.testall for removal in 3.0.
........
2008-05-09 05:26:16 +00:00
Brett Cannon 6bae081293 Blocked revisions 62917 via svnmerge
........
  r62917 | brett.cannon | 2008-05-08 22:18:40 -0700 (Thu, 08 May 2008) | 2 lines

  Deprecate the new module for removal in 3.0.
........
2008-05-09 05:20:35 +00:00
Benjamin Peterson b2ef125c9e Blocked revisions 62912 via svnmerge
........
  r62912 | benjamin.peterson | 2008-05-08 19:27:01 -0500 (Thu, 08 May 2008) | 2 lines

  Add Py3k warnings to os.path.walk
........
2008-05-09 00:32:54 +00:00
Benjamin Peterson d71ca41b37 Remove os.path.walk 2008-05-08 23:44:58 +00:00
Benjamin Peterson 699adb9cd8 Merged revisions 62873,62887,62892-62896,62904 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62873 | raymond.hettinger | 2008-05-08 12:18:13 -0500 (Thu, 08 May 2008) | 1 line

  Issue 2778.  Document the temporary frozenset swap in __contains__(), remove(), and discard().
........
  r62887 | brett.cannon | 2008-05-08 14:50:51 -0500 (Thu, 08 May 2008) | 5 lines

  Make test.test_support.catch_warning() take an argument specifying if any
  triggered warnings should be captured. This allows the context manager to be
  used to just prevent the internal state of the 'warnings' framework and thus
  allow triggered warnings to be displayed.
........
  r62892 | brett.cannon | 2008-05-08 15:20:24 -0500 (Thu, 08 May 2008) | 4 lines

  Fix a bug introduced by the addition of the 'record' argument to
  test.test_support.catch_warning() where showwarning() was not being set
  properly.
........
  r62893 | brett.cannon | 2008-05-08 15:20:54 -0500 (Thu, 08 May 2008) | 2 lines

  Document the 'record' argument for test.test_support.catch_warning().
........
  r62894 | brett.cannon | 2008-05-08 15:23:06 -0500 (Thu, 08 May 2008) | 4 lines

  Fix sys.flags to properly expose bytes_warning.

  Closes issue #2790.
........
  r62895 | brett.cannon | 2008-05-08 15:23:54 -0500 (Thu, 08 May 2008) | 2 lines

  Add a missing entry on  the fix for issue #2790.
........
  r62896 | brett.cannon | 2008-05-08 15:24:43 -0500 (Thu, 08 May 2008) | 2 lines

  Add test.test_support.catch_warning()'s new argument.
........
  r62904 | benjamin.peterson | 2008-05-08 17:09:54 -0500 (Thu, 08 May 2008) | 2 lines

  Replace instances of os.path.walk with os.walk
........
2008-05-08 22:27:58 +00:00
Benjamin Peterson cf7d175ec4 Blocked revisions 62865 via svnmerge
........
  r62865 | barry.warsaw | 2008-05-08 10:30:00 -0500 (Thu, 08 May 2008) | 1 line

  Post tag updates.
........
2008-05-08 22:14:37 +00:00
Amaury Forgeot d'Arc cb0cdce821 Move variable declaration to the top of the block,
to let _json.c compile with Microsoft compilers.
2008-05-08 20:56:43 +00:00
Brett Cannon 6ee80ec920 Blocked revisions 62900 via svnmerge
........
  r62900 | brett.cannon | 2008-05-08 13:36:09 -0700 (Thu, 08 May 2008) | 2 lines

  Deprecate the user module for removal in 3.0.
........
2008-05-08 20:37:28 +00:00
Brett Cannon 34afe87d3a Document that the mutex module is now gone. 2008-05-08 20:31:44 +00:00
Brett Cannon 900ee3a073 Remove the user module. 2008-05-08 20:31:11 +00:00
Brett Cannon 0e87f0f74b Blocked revisions 62888 via svnmerge
........
  r62888 | brett.cannon | 2008-05-08 12:52:45 -0700 (Thu, 08 May 2008) | 2 lines

  Deprecate stringold for removal in 3.0.
........
2008-05-08 19:53:31 +00:00
Brett Cannon e633740ebd Blocked revisions 62884 via svnmerge
........
  r62884 | brett.cannon | 2008-05-08 12:26:08 -0700 (Thu, 08 May 2008) | 2 lines

  The mutex module has been deprecated for removal in 3.0.
........
2008-05-08 19:27:16 +00:00
Brett Cannon d7cce26f7c Remove the mutex module. 2008-05-08 18:55:02 +00:00
Brett Cannon 39143f8156 Block r62879. 2008-05-08 18:16:22 +00:00
Brett Cannon 0d71ee756d Add entry for removal of imputil. Also start the 3.0b1 section. 2008-05-08 18:13:40 +00:00
Brett Cannon 0ec585575d Remove the imputil module. 2008-05-08 18:11:25 +00:00
Guido van Rossum 6d4df9b343 Don't echo the echo commands added to "make install". Fix a typo. 2008-05-08 17:53:56 +00:00
Christian Heimes e4ca8156ef Merged revisions 62805,62811,62841-62842,62848-62849,62853-62854 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62805 | christian.heimes | 2008-05-07 01:59:53 +0200 (Wed, 07 May 2008) | 1 line

  Re-added getbuildinfo.c solution item
........
  r62811 | benjamin.peterson | 2008-05-07 04:23:43 +0200 (Wed, 07 May 2008) | 2 lines

  update .bzrignore
........
  r62841 | christian.heimes | 2008-05-08 00:54:17 +0200 (Thu, 08 May 2008) | 1 line

  Replace more float hacks with correct math functions
........
  r62842 | benjamin.peterson | 2008-05-08 01:11:54 +0200 (Thu, 08 May 2008) | 2 lines

  Practice EAFP, and revert 62787
........
  r62848 | raymond.hettinger | 2008-05-08 06:35:20 +0200 (Thu, 08 May 2008) | 1 line

  Frozensets do not benefit from autoconversion.
........
  r62849 | raymond.hettinger | 2008-05-08 06:36:12 +0200 (Thu, 08 May 2008) | 1 line

  The __all__ variable forgot to expose the gcd() function.
........
  r62853 | raymond.hettinger | 2008-05-08 09:23:30 +0200 (Thu, 08 May 2008) | 1 line

  Fix-up the enumerate type example and move it to the end.
........
  r62854 | ronald.oussoren | 2008-05-08 12:34:39 +0200 (Thu, 08 May 2008) | 3 lines

  Fix for issue 1770190: platform.mac_ver() now returns the right
  version on OSX 10.4.10
........
2008-05-08 17:18:53 +00:00
Raymond Hettinger e580f5c55a Forward port r62849. 2008-05-08 16:03:04 +00:00
Raymond Hettinger 10956eab9e Forward port r62848. 2008-05-08 16:02:10 +00:00
Barry Warsaw 519a658c99 Oops, the retag screwed this up. First step in repairing this. 2008-05-08 15:37:53 +00:00
Barry Warsaw 4a1c213d24 Post tag updates. 2008-05-08 15:31:04 +00:00
Christian Heimes 6f8f2461e5 Blocked revisions 62861 via svnmerge
........
  r62861 | barry.warsaw | 2008-05-08 15:16:19 +0200 (Thu, 08 May 2008) | 1 line

  Bump to 2.6a3
........
2008-05-08 14:30:18 +00:00
Christian Heimes 90540004d3 Merged revisions 62734,62736,62748,62769 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62734 | brett.cannon | 2008-05-05 22:21:38 +0200 (Mon, 05 May 2008) | 5 lines

  Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob
  Ippolito.

  Closes issue #2750.
........
  r62736 | georg.brandl | 2008-05-05 22:53:39 +0200 (Mon, 05 May 2008) | 2 lines

  Fix JSON module docs.
........
  r62748 | benjamin.peterson | 2008-05-06 04:51:10 +0200 (Tue, 06 May 2008) | 2 lines

  PEP 8 nits in json package
........
  r62769 | christian.heimes | 2008-05-06 18:18:41 +0200 (Tue, 06 May 2008) | 2 lines

  Intern static string
  Use float constructors instead of magic code for float constants
........
2008-05-08 14:29:10 +00:00
Barry Warsaw c848655eb0 Move tag. 2008-05-08 13:06:07 +00:00
Barry Warsaw 9eab8b0385 Missed one file 2008-05-08 13:05:38 +00:00
Barry Warsaw 54e74ddf74 Tagging for 3.0a5 2008-05-08 11:56:58 +00:00
Barry Warsaw 160b9a3c94 Bumping versions for 3.0a5 2008-05-08 11:54:13 +00:00
Barry Warsaw 8d109cb043 Antoine Pitrou's patch for bug 2507; exception state lives too long in
3.0.
2008-05-08 04:26:35 +00:00
Alexandre Vassalotti 96de30ae1e Removed test_overflow from test_memoryio.CBytesIOTest.
This test depends too much on the platform it is running-on to be
useful.
2008-05-08 01:45:31 +00:00
Alexandre Vassalotti 8130f7c3c4 Fixed the negative value check in io._BytesIO.seek(). 2008-05-08 01:39:38 +00:00
Alexandre Vassalotti 10dfc1ee31 Fixed bytes naming in the docstrings of _bytesio.c. 2008-05-08 01:34:41 +00:00
Christian Heimes bcd2c08e11 Fixed a memory leak introduced in r62462 2008-05-08 01:20:25 +00:00
Alexandre Vassalotti ec924c995c Reverted (partially) patch r62667 to zipimport.c.
test_pkgutil and test_zipimport are failing on the amd64-gentoo
buildbot due to a yet unknown change introduced by r62667. To find
out what is causing the failure, I am reverting partially r62667.
2008-05-07 02:48:42 +00:00
Benjamin Peterson 9ea0117500 Remove ">>>>" markers left over from merge 2008-05-07 02:16:54 +00:00
Alexandre Vassalotti 7d06089150 Fixed docstring of _bytesio._BytesIO.writelines(). 2008-05-07 01:47:37 +00:00
Alexandre Vassalotti 1bfe9dc871 Changed _bytesio.c to avoid comparing a signed with an unsigned value.
Added tests for overflow checks.
2008-05-07 01:44:31 +00:00
Alexandre Vassalotti 2e0419dcd6 Cleaned how _BytesIO.read() returns an empty bytes object.
Thank you, Guido, for noticing!
2008-05-07 00:09:04 +00:00
Christian Heimes 8e99760c90 Added code to compile new _bytesio on Windows 2008-05-07 00:00:23 +00:00
Christian Heimes 75ca4ea6e1 Merged revisions 62792,62799-62800 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62792 | brett.cannon | 2008-05-07 01:22:02 +0200 (Wed, 07 May 2008) | 2 lines

  When testing a module's __all__, we really don't care if it is deprecated.
........
  r62799 | christian.heimes | 2008-05-07 01:42:58 +0200 (Wed, 07 May 2008) | 1 line

  Disabled some unit tests for the upcoming release. See #2777
........
  r62800 | brett.cannon | 2008-05-07 01:44:04 +0200 (Wed, 07 May 2008) | 2 lines

  Create a TextMate directory in Misc to house a Python-Dev bundle.
........
2008-05-06 23:48:04 +00:00
Alexandre Vassalotti 4833b3c37f Fixed a small bug introduced by r62778.
One of the codepaths of _BytesIO.read() returned a bytearray
object, by mistake, when it should always return a bytes object.
Interestingly, the fact this bug shown up probably means that
some platforms are not using the new C-accelerated io.BytesIO.
2008-05-06 23:47:23 +00:00
Christian Heimes 8dc226fccd Merged revisions 62774-62775,62785,62787-62788 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62774 | georg.brandl | 2008-05-06 19:11:42 +0200 (Tue, 06 May 2008) | 2 lines

  #2773: fix description of 'g' and 'G' formatting spec.
........
  r62775 | georg.brandl | 2008-05-06 19:20:54 +0200 (Tue, 06 May 2008) | 2 lines

  > != (!<).
........
  r62785 | benjamin.peterson | 2008-05-07 00:18:11 +0200 (Wed, 07 May 2008) | 2 lines

  Fix logic error in Python/_warnings.c and add a test to verify
........
  r62787 | benjamin.peterson | 2008-05-07 00:31:52 +0200 (Wed, 07 May 2008) | 2 lines

  Make the Python implementation of warnings compatible with the C implementation regarding non-callable showwarning
........
  r62788 | christian.heimes | 2008-05-07 00:41:46 +0200 (Wed, 07 May 2008) | 1 line

  Implemented PEP 370
........
2008-05-06 23:45:46 +00:00