Commit Graph

170 Commits

Author SHA1 Message Date
Benjamin Peterson
6e18e04273 carefully cleanup pointer cache after creating struct pointers 2011-07-13 23:09:30 -05:00
Victor Stinner
6636121950 Close #4376: ctypes now supports nested structures in a endian different than
the parent structure. Patch by Vlad Riscutia.
2011-07-13 21:43:18 +02:00
Benjamin Peterson
1a07f07337 merge 3.1 2011-03-26 18:17:05 -05:00
Benjamin Peterson
8d6c62dd89 check possible recursive _as_parameter_ to prevent segfault (closes #1838) 2011-03-26 17:56:28 -05:00
Ezio Melotti
3b3499ba69 #11565: Merge with 3.1. 2011-03-16 11:35:38 +02:00
Ezio Melotti
13925008dc #11565: Fix several typos. Patch by Piotr Kasprzyk. 2011-03-16 11:05:33 +02:00
Ezio Melotti
4969f709cc #11515: Merge with 3.1. 2011-03-15 05:59:46 +02:00
Ezio Melotti
42da663e6f #11515: fix several typos. Patch by Piotr Kasprzyk. 2011-03-15 05:18:48 +02:00
Antoine Pitrou
2e811c92c7 Merged revisions 88284 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88284 | antoine.pitrou | 2011-01-31 22:08:57 +0100 (lun., 31 janv. 2011) | 4 lines

  Issue #8275: Fix passing of callback arguments with ctypes under Win64.
  Patch by Stan Mihai. Ok'ed by Georg.
........
2011-01-31 21:36:33 +00:00
Antoine Pitrou
0ea622a5c8 Issue #8275: Fix passing of callback arguments with ctypes under Win64.
Patch by Stan Mihai. Ok'ed by Georg.
2011-01-31 21:08:57 +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
Ezio Melotti
b3aedd4862 #9424: Replace deprecated assert* methods in the Python test suite. 2010-11-20 19:04:17 +00:00
Victor Stinner
749261e241 Issue #8670: ctypes.c_wchar supports non-BMP characters with 32 bits wchar_t 2010-10-02 11:25:35 +00:00
Hirokazu Yamamoto
cc868d430b Issue #3612: Added new types to ctypes.wintypes. (CHAR and pointers) 2010-09-28 21:08:38 +00:00
Matthias Klose
f01611979b Merged revisions 84836 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84836 | matthias.klose | 2010-09-15 15:06:09 +0200 (Mi, 15 Sep 2010) | 3 lines

  Try harder on issue #7356: ctypes.util: Make parsing of ldconfig output
  independent of the locale. Set LC_ALL=C too.
........
2010-09-15 13:08:12 +00:00
Matthias Klose
cf1dd711a4 Try harder on issue #7356: ctypes.util: Make parsing of ldconfig output
independent of the locale. Set LC_ALL=C too.
2010-09-15 13:06:09 +00:00
Daniel Stutzbach
061b14a4a1 Reverted r84315 and r84316, with Benjamin's blessing. The tests were
fine.  They were failing due to a problem exposed in r84307 and fixed
in r84317.   See Issue 8781 for details.
2010-08-31 15:45:04 +00:00
Benjamin Peterson
6505ee8453 apparently this test should be gated, too 2010-08-25 17:57:04 +00:00
Benjamin Peterson
b35f646796 this test is only valid when sizeof(wchar) == Py_UNICODE_SIZE 2010-08-25 17:02:22 +00:00
Florent Xicluna
b4efb3d81e Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,84036 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83212 | florent.xicluna | 2010-07-28 18:39:41 +0200 (mer., 28 juil. 2010) | 2 lines

  Syntax cleanup.
........
  r83829 | florent.xicluna | 2010-08-08 18:16:07 +0200 (dim., 08 août 2010) | 2 lines

  Use unittest specific methods for some urllib test cases.  And replace urllib2 with urllib.request in comments.
........
  r83833 | florent.xicluna | 2010-08-08 18:25:27 +0200 (dim., 08 août 2010) | 2 lines

  Add test case for the HTTPResponse being an iterable.  Follow-up of issue #4608.
........
  r83838 | florent.xicluna | 2010-08-08 20:03:44 +0200 (dim., 08 août 2010) | 2 lines

  Typo.
........
  r83839 | florent.xicluna | 2010-08-08 20:06:13 +0200 (dim., 08 août 2010) | 2 lines

  Issue #7564: Skip test_ioctl if another process is attached to /dev/tty.
........
  r83878 | florent.xicluna | 2010-08-09 10:29:08 +0200 (lun., 09 août 2010) | 1 line

  Merge the 2to3 script from /sandbox/trunk/2to3/2to3, revision 72867 (latest).
........
  r84019 | florent.xicluna | 2010-08-14 17:56:42 +0200 (sam., 14 août 2010) | 11 lines

  Merged manually from 2.7 branch to 3.x trunk.

    ------------------------------------------------------------------------
    r79925 | nick.coghlan | 2010-04-10 16:24:36 +0200 (sam. 10 avril 2010)

    Try to turn some buildbots green by allowing test_multiprocessing to
    pass even if it hits the sys.exc_clear code in the threading module, and
    improve the test coverage by making the ctypes dependencies a bit more
    granular (two of the cited ctypes objects don't exist on my system)
    ------------------------------------------------------------------------
........
  r84025 | florent.xicluna | 2010-08-14 18:56:27 +0200 (sam., 14 août 2010) | 1 line

  List Misc/python-config.in in Misc/README.  Fix few typos.
........
  r84028 | florent.xicluna | 2010-08-14 19:02:49 +0200 (sam., 14 août 2010) | 1 line

  Fix order.
........
  r84032 | florent.xicluna | 2010-08-14 19:15:31 +0200 (sam., 14 août 2010) | 1 line

  Convert to spaces.
........
  r84036 | florent.xicluna | 2010-08-14 20:03:19 +0200 (sam., 14 août 2010) | 1 line

  Remove bad merge (from svnmerge r82301)
........
2010-08-14 18:24:40 +00:00
Tim Golden
3a879e8a27 #9055: remove assertion at the end of test_8959_b since the test is about crashing, not about counting and is difficult to manage when run as a service 2010-08-11 15:59:57 +00:00
Victor Stinner
d5baeee66b Issue #8966: Fix ctypes tests for Windows
I removed the implicit conversion from str to bytes.
2010-07-31 10:52:56 +00:00
Florent Xicluna
02ea12b291 Syntax cleanup. 2010-07-28 16:39:41 +00:00
Victor Stinner
cf448832eb Issue #8966: ctypes: Remove implicit bytes-unicode conversion 2010-07-28 00:15:03 +00:00
Victor Stinner
42746df17b Fix ctypes tests to avoid implicit bytes-unicode conversion 2010-07-27 23:36:41 +00:00
Thomas Heller
b00697e67c Merged revisions 82126-82127 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82126 | thomas.heller | 2010-06-21 16:00:24 +0200 (Mo, 21 Jun 2010) | 1 line

  Fix #8959 by reverting revision 80761.
........
  r82127 | thomas.heller | 2010-06-21 17:01:18 +0200 (Mo, 21 Jun 2010) | 2 lines

  Add tests for problems reported in issue 8959.
........
2010-06-21 16:00:31 +00:00
Victor Stinner
554f3f0081 Issue #850997: mbcs encoding (Windows only) handles errors argument: strict
mode raises unicode errors. The encoder only supports "strict" and "replace"
error handlers, the decoder only supports "strict" and "ignore" error handlers.
2010-06-16 23:33:54 +00:00
Victor Stinner
da0eca427a Issue #8966: If a ctypes structure field is an array of c_char, convert its
value to bytes instead of str (as done for c_char and c_char_p).
2010-06-11 21:50:30 +00:00
Thomas Heller
667ce06de4 Merged revisions 80761,80766 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80761 | thomas.heller | 2010-05-04 20:44:42 +0200 (Di, 04 Mai 2010) | 8 lines

  On Windows, ctypes does no longer check the stack before and after
  calling a foreign function.  This allows to use the unmodified libffi
  library.

  Remove most files from _ctypes/libffi_msvc, only two include files
  stay (updated from _ctypes/libffi/...).  Other files are used in the
  cross-platform _ctypes/libffi directory.
........
  r80766 | thomas.heller | 2010-05-04 21:08:18 +0200 (Di, 04 Mai 2010) | 2 lines

  Remove reference to unused source file.
........
2010-05-04 19:17:41 +00:00
Victor Stinner
45df820591 Merged revisions 80552-80556,80564-80566,80568-80571 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80552 | victor.stinner | 2010-04-27 23:46:03 +0200 (mar., 27 avril 2010) | 3 lines

  Issue #7449, part 1: fix test_support.py for Python compiled without thread
........
  r80553 | victor.stinner | 2010-04-27 23:47:01 +0200 (mar., 27 avril 2010) | 1 line

  Issue #7449, part 2: regrtest.py -j option requires thread support
........
  r80554 | victor.stinner | 2010-04-27 23:51:26 +0200 (mar., 27 avril 2010) | 9 lines

  Issue #7449 part 3, test_doctest: import trace module in test_coverage()

  Import trace module fail if the threading module is missing. test_coverage() is
  only used if test_doctest.py is used with the -c option. This commit allows to
  execute the test suite without thread support.

  Move "import trace" in test_coverage() and use
  test_support.import_module('trace').
........
  r80555 | victor.stinner | 2010-04-27 23:56:26 +0200 (mar., 27 avril 2010) | 6 lines

  Issue #7449, part 4: skip test_multiprocessing if thread support is disabled

  import threading after _multiprocessing to raise a more revelant error message:
  "No module named _multiprocessing". _multiprocessing is not compiled without
  thread support.
........
  r80556 | victor.stinner | 2010-04-28 00:01:24 +0200 (mer., 28 avril 2010) | 8 lines

  Issue #7449, part 5: split Test.test_open() of ctypes/test/test_errno.py

   * Split Test.test_open() in 2 functions: test_open() and test_thread_open()
   * Skip test_open() and test_thread_open() if we are unable to find the C
     library
   * Skip test_thread_open() if thread support is disabled
   * Use unittest.skipUnless(os.name == "nt", ...) on test_GetLastError()
........
  r80564 | victor.stinner | 2010-04-28 00:59:35 +0200 (mer., 28 avril 2010) | 4 lines

  Issue #7449, part 6: fix test_hashlib for missing threading module

  Move @test_support.reap_thread decorator from test_main() to test_threaded_hashing().
........
  r80565 | victor.stinner | 2010-04-28 01:01:29 +0200 (mer., 28 avril 2010) | 6 lines

  Issue #7449, part 7: simplify threading detection in test_capi

   * Skip TestPendingCalls if threading module is missing
   * Test if threading module is present or not, instead of test the presence of
     _testcapi._test_thread_state
........
  r80566 | victor.stinner | 2010-04-28 01:03:16 +0200 (mer., 28 avril 2010) | 4 lines

  Issue #7449, part 8: don't skip the whole test_asynchat if threading is missing

  TestFifo can be executed without the threading module
........
  r80568 | victor.stinner | 2010-04-28 01:14:58 +0200 (mer., 28 avril 2010) | 6 lines

  Issue #7449, part 9: fix test_xmlrpclib for missing threading module

   * Skip testcases using threads if threading module is missing
   * Use "http://" instead of URL in ServerProxyTestCase if threading is missing
     because URL is not set in this case
........
  r80569 | victor.stinner | 2010-04-28 01:33:58 +0200 (mer., 28 avril 2010) | 6 lines

  Partial revert of r80556 (Issue #7449, part 5, fix ctypes test)

  Rewrite r80556: the thread test have to be executed just after the test on
  libc_open() and so the test cannot be splitted in two functions (without
  duplicating code, and I don't want to duplicate code).
........
  r80570 | victor.stinner | 2010-04-28 01:51:16 +0200 (mer., 28 avril 2010) | 8 lines

  Issue #7449, part 10: test_cmd imports trace module using test_support.import_module()

  Use test_support.import_module() instead of import to raise a SkipTest
  exception if the import fail. Import trace fails if the threading module is
  missing.

  See also part 3: test_doctest: import trace module in test_coverage().
........
  r80571 | victor.stinner | 2010-04-28 01:55:59 +0200 (mer., 28 avril 2010) | 6 lines

  Issue #7449, last part (11): fix many tests if thread support is disabled

   * Use try/except ImportError or test_support.import_module() to import thread
     and threading modules
   * Add @unittest.skipUnless(threading, ...) to testcases using threads
........
2010-04-28 22:31:17 +00:00
Benjamin Peterson
886af966d8 Merged revisions 78966,78970,79018,79026-79027,79055,79156,79159,79163-79164,79173,79176,79194,79208,79212 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78966 | florent.xicluna | 2010-03-14 10:20:59 -0500 (Sun, 14 Mar 2010) | 2 lines

  Do not hardcode Expat version.  It's possible to build Python with --with-system-expat option.
........
  r78970 | benjamin.peterson | 2010-03-14 21:58:24 -0500 (Sun, 14 Mar 2010) | 1 line

  this little exception dance is pointless
........
  r79018 | collin.winter | 2010-03-16 22:04:01 -0500 (Tue, 16 Mar 2010) | 1 line

  Delete unused import.
........
  r79026 | vinay.sajip | 2010-03-17 10:05:57 -0500 (Wed, 17 Mar 2010) | 1 line

  Issue #8162: logging: Clarified docstring and documentation for disable function.
........
  r79027 | collin.winter | 2010-03-17 12:36:16 -0500 (Wed, 17 Mar 2010) | 1 line

  Avoid hardcoding refcounts in tests.
........
  r79055 | benjamin.peterson | 2010-03-18 16:30:48 -0500 (Thu, 18 Mar 2010) | 1 line

  remove installation of deleted test/output dir
........
  r79156 | florent.xicluna | 2010-03-20 17:21:02 -0500 (Sat, 20 Mar 2010) | 2 lines

  Cleanup test_struct using check_warnings.
........
  r79159 | florent.xicluna | 2010-03-20 17:26:42 -0500 (Sat, 20 Mar 2010) | 2 lines

  Cleanup test_tarfile, and use check_warnings.
........
  r79163 | michael.foord | 2010-03-20 19:53:39 -0500 (Sat, 20 Mar 2010) | 1 line

  A faulty load_tests in a test module no longer halts test discovery. A placeholder test, that reports the failure, is created instead.
........
  r79164 | michael.foord | 2010-03-20 19:55:58 -0500 (Sat, 20 Mar 2010) | 1 line

  Change order of arguments in a unittest function.
........
  r79173 | georg.brandl | 2010-03-21 04:09:38 -0500 (Sun, 21 Mar 2010) | 1 line

  Document that GzipFile supports iteration.
........
  r79176 | georg.brandl | 2010-03-21 04:17:41 -0500 (Sun, 21 Mar 2010) | 1 line

  Introduce copy by slicing, used in later chapters.
........
  r79194 | florent.xicluna | 2010-03-21 06:58:11 -0500 (Sun, 21 Mar 2010) | 2 lines

  Use assertRaises and add a specific warning filter.
........
  r79208 | andrew.kuchling | 2010-03-21 13:47:12 -0500 (Sun, 21 Mar 2010) | 1 line

  Add items
........
  r79212 | georg.brandl | 2010-03-21 14:01:38 -0500 (Sun, 21 Mar 2010) | 1 line

  Fix plural.
........
2010-03-21 23:13:07 +00:00
Matthias Klose
ffb5384ab1 Merged revisions 78980 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78980 | matthias.klose | 2010-03-15 14:46:04 +0100 (Mo, 15 Mär 2010) | 10 lines

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

  ........
    r78979 | matthias.klose | 2010-03-15 14:42:23 +0100 (Mo, 15 Mär 2010) | 3 lines

    - Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
      the locale.
  ........
................
2010-03-15 13:51:00 +00:00
Matthias Klose
82f60910b7 Merged revisions 78979 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78979 | matthias.klose | 2010-03-15 14:42:23 +0100 (Mo, 15 Mär 2010) | 3 lines

  - Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
    the locale.
........
2010-03-15 13:46:04 +00:00
Gregory P. Smith
1a530917e2 Merged revisions 78544 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78544 | gregory.p.smith | 2010-02-28 20:56:12 -0800 (Sun, 28 Feb 2010) | 2 lines

  Adds c_ssize_t to ctypes.  issue 6729.
........
2010-03-01 04:59:27 +00:00
Thomas Heller
41c5d2fb56 Merged revisions 78382 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78382 | thomas.heller | 2010-02-23 21:25:02 +0100 (Di, 23 Feb 2010) | 11 lines

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

  ........
    r78380 | thomas.heller | 2010-02-23 21:11:44 +0100 (Di, 23 Feb 2010) | 4 lines

    ctypes CThunkObject was not registered correctly with the cycle
    garbage collector, leading to possible leaks when using callback
    functions.
  ........
................
2010-02-23 20:32:43 +00:00
Thomas Heller
5117b0b0dc Merged revisions 78380 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78380 | thomas.heller | 2010-02-23 21:11:44 +0100 (Di, 23 Feb 2010) | 4 lines

  ctypes CThunkObject was not registered correctly with the cycle
  garbage collector, leading to possible leaks when using callback
  functions.
........
2010-02-23 20:25:02 +00:00
Eric Smith
5ccfa29f04 Changed try/finally to contextlib.closing, as discussed in issue 6882. 2009-10-23 12:56:11 +00:00
Ezio Melotti
6e52a5a837 Merged revisions 75064 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r75064 | ezio.melotti | 2009-09-26 00:35:24 +0300 (Sat, 26 Sep 2009) | 1 line

  fix print statement
........
2009-09-25 21:38:29 +00:00
Ezio Melotti
af30d2eeaa fix print statement 2009-09-25 21:35:24 +00:00
Thomas Heller
49ac2ac740 Merged revisions 74922 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74922 | thomas.heller | 2009-09-18 22:08:39 +0200 (Fr, 18 Sep 2009) | 10 lines

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

  ........
    r74921 | thomas.heller | 2009-09-18 22:05:44 +0200 (Fr, 18 Sep 2009) | 3 lines

    Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...)
    does now always result in NULL.
  ........
................
2009-09-18 20:09:57 +00:00
Thomas Heller
69b639f946 Merged revisions 74921 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74921 | thomas.heller | 2009-09-18 22:05:44 +0200 (Fr, 18 Sep 2009) | 3 lines

  Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...)
  does now always result in NULL.
........
2009-09-18 20:08:39 +00:00
Thomas Heller
35888e2b3c Merged revisions 74918 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74918 | thomas.heller | 2009-09-18 21:05:13 +0200 (Fr, 18 Sep 2009) | 11 lines

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

  ........
    r74917 | thomas.heller | 2009-09-18 20:55:17 +0200 (Fr, 18 Sep 2009) | 3 lines

    Issue #5042: Structure sub-subclass does now initialize correctly with
    base class positional arguments.
  ........

  Also made small stylistic changes.
................
2009-09-18 19:46:56 +00:00
Thomas Heller
d7cb1b9119 Merged revisions 74917 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74917 | thomas.heller | 2009-09-18 20:55:17 +0200 (Fr, 18 Sep 2009) | 3 lines

  Issue #5042: Structure sub-subclass does now initialize correctly with
  base class positional arguments.
........

Also made small stylistic changes.
2009-09-18 19:05:13 +00:00
Eric Smith
53cda5312a Merged revisions 74907 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r74907 | eric.smith | 2009-09-18 09:23:13 -0400 (Fri, 18 Sep 2009) | 1 line

  Issue #6882: Import uuid creates zombies processes. I used a slightly different patch than the one attached to the issue, to be consistent with the style in the rest of the module.
........
2009-09-18 13:59:58 +00:00
Eric Smith
81fd804034 Issue #6882: Import uuid creates zombies processes. I used a slightly different patch than the one attached to the issue, to be consistent with the style in the rest of the module. 2009-09-18 13:23:13 +00:00
Thomas Heller
e83c938e21 Merged revisions 74664 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r74664 | thomas.heller | 2009-09-04 20:24:41 +0200 (Fr, 04 Sep 2009) | 1 line

  Issue 6239: ctypes.c_char_p return value must return bytes.
........
2009-09-04 18:37:03 +00:00
Thomas Heller
8b93952621 Issue 6239: ctypes.c_char_p return value must return bytes. 2009-09-04 18:24:41 +00:00
Georg Brandl
fe5f11c684 Merged revisions 73718,73721,73723 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r73718 | benjamin.peterson | 2009-07-01 01:35:19 +0200 (Mi, 01 Jul 2009) | 9 lines

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

  ........
    r73717 | benjamin.peterson | 2009-06-30 18:30:12 -0500 (Tue, 30 Jun 2009) | 1 line

    use assert* methods in test_unittest
  ........
................
  r73721 | benjamin.peterson | 2009-07-01 02:43:10 +0200 (Mi, 01 Jul 2009) | 11 lines

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

  ........
    r73720 | benjamin.peterson | 2009-06-30 19:36:41 -0500 (Tue, 30 Jun 2009) | 4 lines

    fix a few cases where automated fail -> assert translation messed up

    Thanks Joe Amenta
  ........
................
  r73723 | benjamin.peterson | 2009-07-01 02:45:43 +0200 (Mi, 01 Jul 2009) | 1 line

  remove use of failIf
................
2009-08-13 08:52:53 +00:00
Georg Brandl
ab91fdef1f Merged revisions 73715 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line

  convert old fail* assertions to assert*
........
2009-08-13 08:51:18 +00:00
Benjamin Peterson
77108eb4bf Merged revisions 73720 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73720 | benjamin.peterson | 2009-06-30 19:36:41 -0500 (Tue, 30 Jun 2009) | 4 lines

  fix a few cases where automated fail -> assert translation messed up

  Thanks Joe Amenta
........
2009-07-01 00:43:10 +00:00