Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity
124,253 Commits 6 Branches 593 Tags 2.8 GiB
Commit Graph

612 Commits

Author SHA1 Message Date
Serhiy Storchaka d9c956fb23 Issue #20804: The unittest.mock.sentinel attributes now preserve their 
identity when they are copied or pickled.
 2017-01-11 20:13:03 +02:00
Victor Stinner cd992bbe73 Merge 3.6 2017-01-06 18:16:07 +01:00
Victor Stinner 84b6fb0eea Fix unittest.mock._Call: don't ignore name 
Issue #28961: Fix unittest.mock._Call helper: don't ignore the name parameter
anymore.

Patch written by Jiajun Huang.
 2017-01-06 18:15:51 +01:00
Berker Peksag 161a4dd495 Issue #28919: Simplify _copy_func_details() in unittest.mock 
Patch by Jiajun Huang.
 2016-12-15 05:21:44 +03:00
Gregory P. Smith ac5084b6c7 Fixes issue28380: unittest.mock Mock autospec functions now properly support 
assert_called, assert_not_called, and assert_called_once.
 2016-10-06 14:31:23 -07:00
Berker Peksag eadf443e9a Issue #28303: Merge from 3.5 2016-09-28 17:29:12 +03:00
Berker Peksag aa5c2fdb7c Issue #28303: Fix grammar in unittest.__doc__, patch by Shlomi Fish 2016-09-28 17:28:41 +03:00
Berker Peksag b3d4e7fe71 Issue #25651: Merge from 3.5 2016-09-21 19:35:28 +03:00
Berker Peksag 16ea19fc66 Issue #25651: Allow falsy values to be used for msg parameter of subTest() 2016-09-21 19:34:15 +03:00
Martin Panter 0be894b2f6 Issue #27895: Spelling fixes (Contributed by Ville Skyttä). 2016-09-07 12:03:06 +00:00
R David Murray 44b548dda8 #27364: fix "incorrect" uses of escape character in the stdlib. 
And most of the tools.

Patch by Emanual Barry, reviewed by me, Serhiy Storchaka, and
Martin Panter.
 2016-09-08 13:59:53 -04:00
Raymond Hettinger 15f44ab043 Issue #27895: Spelling fixes (Contributed by Ville Skyttä). 2016-08-30 10:47:49 -07:00
Raymond Hettinger f74c33ad5c Merge 2016-08-25 21:12:16 -07:00
Raymond Hettinger 7ea386e56e Issue 19504: Change "customise" to "customize" American spelling. 2016-08-25 21:11:50 -07:00
Gregory P. Smith c35a32fe85 Issue #26750: use inspect.isdatadescriptor instead of our own 
_is_data_descriptor().
 2016-08-15 23:56:32 -07:00
Gregory P. Smith d4583d7fea Issue #26750: use inspect.isdatadescriptor instead of our own 
_is_data_descriptor().
 2016-08-15 23:23:40 -07:00
Gregory P. Smith d0d24fd1ae Issue #26750: unittest.mock.create_autospec() now works properly for 
subclasses of property() and other data descriptors.  Removes the never
publicly used, never documented unittest.mock.DescriptorTypes tuple.
 2016-08-07 09:06:27 -07:00
Gregory P. Smith 9854789efe Issue #26750: unittest.mock.create_autospec() now works properly 
for subclasses of property() and other data descriptors.
 2016-08-07 08:52:26 -07:00
Martin Panter 8bde911115 Issue #27626: Merge spelling fixes from 3.5 2016-07-28 01:30:58 +00:00
Martin Panter eb9957065a Issue #27626: Spelling fixes in docs, comments and internal names 
Based on patch by Ville Skyttä.
 2016-07-28 01:11:04 +00:00
Martin Panter 702f4f5d6f Issue #23804: Merge spelling and NEWS fixes from 3.5 2016-07-11 12:54:44 +00:00
Martin Panter 204bf0b9ae English spelling and grammar fixes 2016-07-11 07:51:37 +00:00
Berker Peksag a9e1ebb780 Issue #27430: Merge from 3.5 2016-07-01 12:17:45 +03:00
Berker Peksag e39682b076 Issue #27430: Fix typos, patch by scop. 2016-07-01 12:17:05 +03:00
Serhiy Storchaka 6c85091b5b Issue #23641: Added __getnewargs_ex__ to the list of special mock attributes. 2016-06-19 18:32:07 +03:00
Serhiy Storchaka 5943ea76d5 Issue #23641: Added __getnewargs_ex__ to the list of special mock attributes. 2016-06-19 18:30:43 +03:00
Kushal Das 9cd39a170b Issue #21271: Adds new keyword only parameters in reset_mock call 
We now have two keyword only parameters in the reset_mock function to
selectively reset the return_value or the side_effects, or both.
 2016-06-02 10:20:16 -07:00
Martin Panter 0b7d84de6b Issue #27171: Merge typo fixes from 3.5 2016-06-02 10:11:18 +00:00
Martin Panter e26da7c03a Issue #27171: Fix typos in documentation, comments, and test function names 2016-06-02 10:07:09 +00:00
Martin Panter 3e04d5b306 Issue #27076: Merge spelling from 3.5 2016-05-26 06:03:19 +00:00
Martin Panter 46f50726a0 Issue #27076: Doc, comment and tests spelling fixes 
Most fixes to Doc/ and Lib/ directories by Ville Skyttä.
 2016-05-26 05:35:26 +00:00
Serhiy Storchaka 742206d95c Issue #27063: Some unittest loader tests were silently skipped. 2016-05-20 23:29:07 +03:00
Serhiy Storchaka 0dad755600 Issue #27063: Some unittest loader tests were silently skipped. 2016-05-20 23:28:37 +03:00
Robert Collins c85dd85f1a Issue #26807: mock_open 'files' no longer error on readline at end of file. 
Patch from Yolanda Robla.
 2016-05-16 15:22:45 +12:00
Robert Collins 9549a3e3d4 Issue #26807: mock_open 'files' no longer error on readline at end of file. 
Patch from Yolanda Robla.
 2016-05-16 15:22:01 +12:00
Serhiy Storchaka 81e7f94076 Merge 3.5 2016-04-25 08:58:59 +03:00
Serhiy Storchaka 685fbed7f9 Issue #26837: assertSequenceEqual() now correctly outputs non-stringified 
differing items (like bytes in the -b mode).  This affects assertListEqual()
and assertTupleEqual().
 2016-04-25 08:58:25 +03:00
Serhiy Storchaka e437a10d15 Issue #23277: Remove unused imports in tests. 2016-04-24 21:41:02 +03:00
Berker Peksag 1e8ee9b380 Issue #23277: Remove unused sys and os imports 
Patch by Jon Dufresne.
 2016-04-24 07:31:42 +03:00
Victor Stinner 6e722bc13f Merge 3.5 (test_unittest) 2016-03-30 01:15:48 +02:00
Victor Stinner 9db2ae7263 Fix ResourceWarning in test_unittest when interrupted 2016-03-30 01:15:28 +02:00
Berker Peksag 5a6c018b57 Issue #25195: Fix a regression in mock.MagicMock 
_Call is a subclass of tuple (changeset 3603bae63c13 only works
for classes) so we need to implement __ne__ ourselves.

Patch by Andrew Plummer.
 2016-03-28 00:30:40 +03:00
Berker Peksag ce913877e4 Issue #25195: Fix a regression in mock.MagicMock 
_Call is a subclass of tuple (changeset 3603bae63c13 only works
for classes) so we need to implement __ne__ ourselves.

Patch by Andrew Plummer.
 2016-03-28 00:30:02 +03:00
Robert Collins bfef0be420 #25320: Handle sockets in directories unittest discovery is scanning. 
Patch from Victor van den Elzen.
 2016-03-15 13:33:28 +13:00
Robert Collins ecd5383891 #25320: Handle sockets in directories unittest discovery is scanning. 
Patch from Victor van den Elzen.
 2016-03-15 13:29:17 +13:00
Victor Stinner 2c2a4e63d7 Add Mock.assert_called() 
Issue #26323: Add assert_called() and assert_called_once() methods to
unittest.mock.Mock.
 2016-03-11 22:17:48 +01:00
Brett Cannon 43dab4bfcf Merge 'used with permission' additions 2016-01-15 09:54:16 -08:00
Brett Cannon 07b954d148 Add some "used with permission" mentions where external resources are referenced. 
Permission was validated prior to adding these markings.
 2016-01-15 09:53:51 -08:00
Senthil Kumaran 121edbf7e2 Issue25347 - Format the error message output of mock's assert_has_calls method. 
Patch contributed by Robert Zimmerman.
 2016-01-12 06:18:32 -08:00
Senthil Kumaran 81bc927da7 Issue #22138: Fix mock.patch behavior when patching descriptors. Restore 
original values after patching.

Patch contributed by Sean McCully.
 2016-01-08 23:43:29 -08:00
Martin Panter d2ad5718ad Issue #25523: Further a-to-an corrections new in 3.5 2015-11-02 04:20:33 +00:00
Serhiy Storchaka 153627c111 Marked keystrokes with the :kbd: role. 
Fixed the case of the "Ctrl-" prefixes.
 2015-09-12 17:46:20 +03:00
Serhiy Storchaka 0424eaf753 Marked keystrokes with the :kbd: role. 
Fixed the case of the "Ctrl-" prefixes.
 2015-09-12 17:45:25 +03:00
Berker Peksag 29bf4d403d Issue #24857: Comparing call_args to a long sequence now correctly returns a 
boolean result instead of raising an exception.

Patch by A Kaptur.
 2015-09-09 23:39:45 +03:00
Berker Peksag 3fc536f1c9 Issue #24857: Comparing call_args to a long sequence now correctly returns a 
boolean result instead of raising an exception.

Patch by A Kaptur.
 2015-09-09 23:35:25 +03:00
Robert Collins 079fc7faff Issue #21112: Fix regression in unittest.expectedFailure on subclasses. 
Patch from Berker Peksag.
 2015-08-28 10:35:14 +12:00
Robert Collins ed599b7c84 Issue #21112: Fix regression in unittest.expectedFailure on subclasses. 
Patch from Berker Peksag.
 2015-08-28 10:34:51 +12:00
Robert Collins be6caca534 Issue #20362: Honour TestCase.longMessage correctly in assertRegex. 
Patch from Ilia Kurenkov.
 2015-08-20 11:13:09 +12:00
Berker Peksag 86b34da5ef Issue #23004: mock_open() now reads binary data correctly when the type of read_data is bytes. 
Initial patch by Aaron Hill.
 2015-08-06 13:15:51 +03:00
Robert Collins ca647ef60a Issue #21750: Further fixup to be styled like other mock APIs. 2015-07-24 03:48:20 +12:00
Robert Collins 92b3e06517 Typo fix in mock.patch. 
Patch from https://github.com/testing-cabal/mock/issues/215
 2015-07-17 21:58:36 +12:00
Robert Collins 5329aaa74b Issue #21750: mock_open.read_data can now be read from each instance, as it 
could in Python 3.3.
 2015-07-17 20:08:45 +12:00
Robert Collins b37f43f94b - Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely. 
Patch from Nicola Palumbo and Laurent De Buyst.
 2015-07-15 11:42:28 +12:00
Berker Peksag abfaecdfdd Issue #23004: mock_open() now reads binary data correctly when the type of read_data is bytes. 
Initial patch by Aaron Hill.
 2015-08-06 13:16:52 +03:00
Robert Collins 88ba360c88 Issue #21750: Further fixup to be styled like other mock APIs. 2015-07-24 03:48:45 +12:00
Robert Collins 1a80081272 Typo fix in mock.patch. 
Patch from https://github.com/testing-cabal/mock/issues/215
 2015-07-17 22:00:28 +12:00
Robert Collins 4838717b53 Issue #21750: mock_open.read_data can now be read from each instance, as it 
could in Python 3.3.
 2015-07-17 20:10:23 +12:00
Robert Collins 76d508b5d4 - Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely. 
Patch from Nicola Palumbo and Laurent De Buyst.
 2015-07-15 11:49:43 +12:00
Robert Collins f58f88c4c7 Issue #23661: unittest.mock side_effects can now be exceptions again. 
This was a regression vs Python 3.4. Patch from Ignacio Rossi
 2015-07-14 13:51:40 +12:00
Serhiy Storchaka 041dd8eef1 Issue #15836: assertRaises(), assertRaisesRegex(), assertWarns() and 
assertWarnsRegex() assertments now check the type of the first argument
to prevent possible user error.  Based on patch by Daniel Wagner-Hall.
 2015-05-21 20:15:40 +03:00
Serhiy Storchaka e98209c2b4 Issue #24245: Eliminated senseless expect clauses that have no any effect. 
Patch by Martin Panter.
 2015-05-20 16:10:04 +03:00
Serhiy Storchaka df573d6ad8 Issue #24134: assertRaises(), assertRaisesRegex(), assertWarns() and 
assertWarnsRegex() checks now emits a deprecation warning when callable is
None or keyword arguments except msg is passed in the context manager mode.
 2015-05-16 16:29:50 +03:00
Serhiy Storchaka fe373a5425 Fixed English in error message. 2015-05-06 19:22:55 +03:00
Serhiy Storchaka 4b5367c46d Fixed English in error message. 2015-05-06 19:21:00 +03:00
Serhiy Storchaka 24d3b7f9df Issue #24134: assertRaises(), assertRaisesRegex(), assertWarns() and 
assertWarnsRegex() checks are not longer successful if the callable is None.

Added tests for assertRaises().
 2015-05-06 19:14:47 +03:00
Serhiy Storchaka e130503c7b Issue #24134: assertRaises(), assertRaisesRegex(), assertWarns() and 
assertWarnsRegex() checks are not longer successful if the callable is None.

Added tests for assertRaises().
 2015-05-06 19:13:11 +03:00
Łukasz Langa a468db9b0b Issue #23310: Fix MagicMock's initializer to work with __methods__. 
Behavior equivalent to m.configure_mock().  Patch by Kasia Jachim.
 2015-04-13 23:12:42 -07:00
Brett Cannon f299abdafa Issue #23731: Implement PEP 488. 
The concept of .pyo files no longer exists. Now .pyc files have an
optional `opt-` tag which specifies if any extra optimizations beyond
the peepholer were applied.
 2015-04-13 14:21:02 -04:00
Łukasz Langa 5f6684efe0 Issue #23310: Fix MagicMock's initializer to work with __methods__. 
Behavior equivalent to m.configure_mock().  Patch by Kasia Jachim.
 2015-04-14 00:12:57 -07:00
Serhiy Storchaka a7d00c207f Reverted issue #24134 changes (except new tests). 2015-05-16 16:25:43 +03:00
Antoine Pitrou 8eef6a9ad0 Issue #22903: The fake test case created by unittest.loader when it fails importing a test module is now picklable. 2015-03-19 00:01:37 +01:00
Antoine Pitrou d833779cea Issue #22903: The fake test case created by unittest.loader when it fails importing a test module is now picklable. 2015-03-18 23:56:46 +01:00
Berker Peksag 7aaa85932c Issue #23568: Add rdivmod support to MagicMock() objects. 
Patch by Håkan Lövdahl.
 2015-03-15 01:57:38 +02:00
Berker Peksag a785dece57 Issue #23568: Add rdivmod support to MagicMock() objects. 
Patch by Håkan Lövdahl.
 2015-03-15 01:51:56 +02:00
Berker Peksag 9bd8af788d Issue #23581: Add matmul support to MagicMock. 
Patch by Håkan Lövdahl.
 2015-03-12 20:42:48 +02:00
Robert Collins f0c819acd0 Issue #22936: Allow showing local variables in unittest errors. 2015-03-06 13:46:35 +13:00
Robert Collins 7e28df94ec unittest: Trivial typo fix. 2015-03-06 11:35:29 +13:00
Serhiy Storchaka 08448a1f4d Issue #23326: Removed __ne__ implementations. Since fixing default __ne__ 
implementation in issue #21408 they are redundant.
 2015-01-31 12:05:05 +02:00
Serhiy Storchaka 34af5023fc Issue #21408: The default __ne__() now returns NotImplemented if __eq__() 
returned NotImplemented.  Removed incorrect implementations of __ne__().
 2015-01-26 10:04:15 +02:00
Serhiy Storchaka f4b7a02e93 Issue #21408: The default __ne__() now returns NotImplemented if __eq__() 
returned NotImplemented.  Removed incorrect implementations of __ne__().
 2015-01-26 09:57:07 +02:00
Antoine Pitrou 18f22989dd Issue #22894: TestCase.subTest() would cause the test suite to be stopped when in failfast mode, even in the absence of failures. 2014-11-23 15:55:11 +01:00
Victor Stinner eb1a995a7c Issue #22823: Fix typo in unittest/mock.py 2014-12-11 22:25:49 +01:00
Serhiy Storchaka c02d188a84 Issue #22823: Use set literals instead of creating a set from a list. 
Fixed an output of sets in examples.
 2014-12-11 10:28:14 +02:00
Antoine Pitrou b9079c81dd Issue #22894: TestCase.subTest() would cause the test suite to be stopped when in failfast mode, even in the absence of failures. 2014-11-23 15:56:41 +01:00
Robert Collins 68b11d129d Fix regression in issue 22457 fix. 
When used in the real world it can under some situations trigger
"    assert not _relpath.startswith('..'), "Path must be within the project"
     AssertionError: Path must be within the project
"

Because _get_name_from_path was not expecting to be called with the top level
directory.
 2014-11-05 03:43:36 +13:00
Robert Collins bf2bda3c97 Close #22457: Honour load_tests in the start_dir of discovery. 
We were not honouring load_tests in a package/__init__.py when that was the
start_dir parameter, though we do when it is a child package. The fix required
a little care since it introduces the possibility of infinite recursion.
 2014-11-05 03:09:01 +13:00
Robert Collins 659dd625b4 Close #7559: ImportError when loading a test now shown as ImportError. 
Previously the ImportError was only shown if the top level containing
package failed to import, with other ImportErrors showing up as
AttributeError - hiding the real cause. As part of this,
`TestLoader.loadTestsFromNames` now captures errors to self.errors.
 2014-10-30 08:27:27 +13:00
Robert Collins c134584020 Close #22756: Improve the test output for some assertEqual tests. 
These tests were undebuggable as written, and there's no testing fallacy
involved in using the method we're testing to test the output of that method,
so switch to that.
 2014-10-30 08:16:28 +13:00
Robert Collins f920c2122b Close #19746: expose unittest discovery errors on TestLoader.errors 
This makes it possible to examine the errors from unittest discovery
without executing the test suite - important when the test suite may
be very large, or when enumerating the test ids from a test suite.
 2014-10-20 13:24:05 +13:00
Berker Peksag 1ed2e69a4a Issue #22186: Fix typos in Lib/. 
Patch by Févry Thibault.
 2014-10-19 18:07:05 +03:00
Berker Peksag f23530f569 Issue #22186: Fix typos in Lib/. 
Patch by Févry Thibault.
 2014-10-19 18:04:38 +03:00
Benjamin Peterson e87b7eafe4 fix windows tests (#16662) 
From Robert Collins.
 2014-09-29 21:54:28 -04:00
Kushal Das a37b958d65 Closes #21270 : We now override tuple methods in mock.call objects. 2014-09-16 18:33:37 +05:30
Barry Warsaw bb1e3f1ebe A few tweaks for issue16662 based on feedback from Robert Collins. 2014-09-08 17:29:02 -04:00
Barry Warsaw d78742a260 - Issue #16662: load_tests() is now unconditionally run when it is present in 
a package's __init__.py.  TestLoader.loadTestsFromModule() still accepts
  use_load_tests, but it is deprecated and ignored.  A new keyword-only
  attribute `pattern` is added and documented.  Patch given by Robert Collins,
  tweaked by Barry Warsaw.
 2014-09-08 14:21:37 -04:00
Ezio Melotti 869778e520 #22092: merge with 3.4. 2014-08-07 03:28:26 +03:00
Ezio Melotti 1241c47aa2 #22092: use absolute imports in unittest tests. Patch by Vajrasky Kok. 2014-08-07 03:20:22 +03:00
Serhiy Storchaka 521e5860a5 Issue #22032: __qualname__ instead of __name__ is now always used to format 
fully qualified class names of Python implemented classes.
 2014-07-22 15:00:37 +03:00
R David Murray 130a566a13 Suppress a couple more DeprecationWarnings in the test suite. 2014-06-11 17:09:43 -04:00
Kushal Das 047f14c3c6 Closes #21256: Printout of keyword args in deterministic order in mock calls. 
Printout of keyword args should be in deterministic order in
a mock function call. This will help to write better doctests.
 2014-06-09 13:45:56 +05:30
Antoine Pitrou b1e58440f8 Issue #9815: assertRaises now tries to clear references to local variables in the exception's traceback. 2014-04-29 01:25:07 +02:00
Antoine Pitrou 9681022f1e Issue #9815: assertRaises now tries to clear references to local variables in the exception's traceback. 2014-04-29 01:23:50 +02:00
Ethan Furman 7b9ff0e6da Issue8297: module attribute lookup failures now include module name in error message. 2014-04-24 14:47:47 -07:00
Michael Foord ebc1a30d55 Closes issue 21239. unittest.mock.patch.stopall() did not work deterministically when the same name was patched multiple times. 2014-04-15 17:21:08 -04:00
Kushal Das 484f8a875b Closes Issue 21222. 
Passing name keyword argument to mock.create_autospec now works.
 2014-04-16 01:05:50 +05:30
Mark Dickinson d12290654a Fix typo in test method name. 2014-04-18 16:08:47 +01:00
Kushal Das 68290f4895 Removes unused varargs and varkwargs from assert_not_called(). 2014-04-17 01:54:07 +05:30
Kushal Das 8af9db3e4f Closes Issue 21262: New method assert_not_called for Mock. 
It raises AssertionError if the mock has been called.
 2014-04-17 01:36:14 +05:30
Kushal Das 8c14534df6 Closes Issue 21238: New keyword argument `unsafe` to Mock. 
It raises `AttributeError` incase of an attribute startswith assert
or assret.
 2014-04-16 23:32:21 +05:30
Michael Foord 15f2d1775e Merge 2014-04-15 17:22:22 -04:00
Kushal Das 5d1f6c3b15 Merge 2014-04-16 01:22:52 +05:30
Michael Foord fddcfa27fa Closes issue 17660. You no longer need to explicitly pass create=True when patching builtin names. 2014-04-14 16:25:20 -04:00
Michael Foord 01bafdcccc Issue 17826. Setting an iterable side_effect on a mock created by create_autospec now works 2014-04-14 16:09:42 -04:00
Michael Foord d2623d7786 Issue 20968. unittest.mock.MagicMock now supports division 2014-04-14 11:23:48 -04:00
R David Murray ef1c26798c backport: #20145: assert[Raises|Warns]Regex now raise TypeError on bad regex. 
Previously a non-string, non-regex second argument and missing callable
argument could cause the test to appear to always pass.

Initial patch by Kamilla Holanda.
 2014-03-25 15:31:50 -04:00
Larry Hastings 5c66189e88 Issue #20189: Four additional builtin types (PyTypeObject, 
PyMethodDescr_Type, _PyMethodWrapper_Type, and PyWrapperDescr_Type)
have been modified to provide introspection information for builtins.
Also: many additional Lib, test suite, and Argument Clinic fixes.
 2014-01-24 06:17:25 -08:00
Gregory P. Smith 5a6d4bf671 Fixes Issue #20165: The unittest module no longer considers tests marked with 
@expectedFailure successful if they pass.
 2014-01-20 01:11:18 -08:00
Antoine Pitrou b5c66f8645 Fix breakage in TestSuite.countTestCases() introduced by issue #11798. 2013-12-28 20:37:58 +01:00
Serhiy Storchaka 184ec79bd3 Remove commented out debugging code (remnants of issue #18996). 2013-12-10 13:53:56 +02:00
Victor Stinner 031bd532c4 Close #19880: Fix a reference leak in unittest.TestCase. Explicitly break 
reference cycles between frames and the _Outcome instance.
 2013-12-09 01:52:50 +01:00
Michael Foord 514afeb65c Merge 2013-11-23 13:30:03 +00:00
Michael Foord e28bb15054 Issue 17457: extend test discovery to support namespace packages 2013-11-23 13:29:23 +00:00
Serhiy Storchaka bc39869095 Issue #19594: Use specific asserts in unittest tests. 2013-11-17 00:14:35 +02:00
Serhiy Storchaka 5665bc5980 Issue #19594: Use specific asserts in unittest tests. 2013-11-17 00:12:21 +02:00
Antoine Pitrou 6c6b3f770d Issue #19352: Fix unittest discovery when a module can be reached through several paths (e.g. under Debian/Ubuntu with virtualenv). 2013-10-23 19:15:05 +02:00
Antoine Pitrou d5d0bc35ad Issue #19352: Fix unittest discovery when a module can be reached through several paths (e.g. under Debian/Ubuntu with virtualenv). 2013-10-23 19:11:29 +02:00
Serhiy Storchaka 77622f55c2 Issue #18996: TestCase.assertEqual() now more cleverly shorten differing 
strings in error report.
 2013-09-23 23:07:00 +03:00
Michael Foord 468ec34084 Remove shadowed test 2013-09-15 20:05:19 +12:00
Antoine Pitrou 0715b9fad3 Issue #18937: Add an assertLogs() context manager to unittest.TestCase to ensure that a block of code emits a message using the logging module. 2013-09-14 19:45:47 +02:00
Antoine Pitrou a19b1a664f Adjust comment 2013-09-14 00:40:46 +02:00
Antoine Pitrou 4b3c58c8a0 Issue #19013: add a __main__ to unittest.test.testmock to ease CLI invocation 2013-09-14 00:39:15 +02:00
Antoine Pitrou e1ba8df182 Issue #19013: add a __main__ to unittest.test to ease CLI invocation 2013-09-14 00:37:18 +02:00
Antoine Pitrou 356bdeb0a1 Issue #19013: add unittest.main() epilogs to unittest.mock's own test modules 2013-09-13 23:54:01 +02:00
Antoine Pitrou 1d7c8c9a00 Issue #19013: add unittest.main() epilogs to unittest's own test modules 2013-09-13 23:52:46 +02:00
Mark Dickinson 23543ebd86 Merge docstring typo fix from 3.3 2013-09-09 10:34:56 +01:00
Mark Dickinson 51ef074d57 Docstring typo fix: Arithmentic -> Arithmetic. 2013-09-09 10:34:24 +01:00
Andrew Svetlov 8913a6c83d Issue #11798: fix tests for regrtest -R : 2013-09-01 07:58:41 +03:00
Tim Peters 59360aadd3 Back out 868ad6fa8e68 - it left all the buildbots failing. 
Unclear to me why it was pushed to begin with.  See issue 11798.
Perhaps it's because regrtest with -R was failing?  Fine, but
that's better than regrtest _always_ failing ;-)
 2013-08-31 23:44:34 -05:00
Andrew Svetlov a41213726b Temporary disable tests cleanup (issue 11798). 2013-08-31 20:55:25 +03:00
Serhiy Storchaka de2800f8f1 Issue #17974: Switch unittest from using getopt to using argparse. 2013-08-29 12:37:28 +03:00
Andrew Svetlov eb97368451 Issue #11798: TestSuite now drops references to own tests after execution. 2013-08-28 21:28:38 +03:00
Ezio Melotti e0c69161bc #18741: merge with 3.3. 2013-08-17 16:13:22 +03:00
Ezio Melotti b5bc353b88 #18741: fix more typos. Patch by Févry Thibault. 2013-08-17 16:11:40 +03:00
Ezio Melotti b2855ccd09 #18663: merge with 3.3. 2013-08-11 13:05:37 +03:00
Ezio Melotti d51914c6c1 #18663: document that assertAlmostEqual also works when the values are equal and add tests. 2013-08-11 13:04:50 +03:00
Łukasz Langa 06d3abbff3 clean the environment from pre-existing PYTHONWARNINGS for test_warnings 2013-04-24 01:51:42 +02:00
Łukasz Langa 6ae466732c clean the environment from pre-existing PYTHONWARNINGS for test_warnings 2013-04-24 01:49:52 +02:00
R David Murray c601dc1639 Merge #14971: Use class method name, not function.__name__, during unittest discovery. 2013-04-11 08:58:11 -04:00
R David Murray 5e2f593145 #14971: Use class method name, not function.__name__, during unittest discovery. 2013-04-11 08:55:45 -04:00
Andrew Svetlov 8ab1e513c1 Process DEFAULT values in mock side_effect that returns iterator. 
Patch by Michael Ford.
 2013-04-07 16:44:07 +03:00
Andrew Svetlov 8b2cd75bdd Process DEFAULT values in mock side_effect that returns iterator. 
Patch by Michael Ford.
 2013-04-07 16:42:24 +03:00
Antoine Pitrou 22e162f462 Fix bug in TestResult.addSubTest() 2013-03-29 17:55:24 +01:00
Ezio Melotti 85a25222bc #8906: merge with 3.3. 2013-03-29 03:43:38 +02:00
Ezio Melotti 31797e5efe #8906: document failureException, longMessage, and maxDiff in the class docstring. Patch by Boris Feld. 2013-03-29 03:42:29 +02:00
Ezio Melotti 67ddccafc3 #17329: merge with 3.3. 2013-03-27 20:13:59 +02:00
Ezio Melotti 184e59357e #17329: merge with 3.2. 2013-03-27 20:12:55 +02:00
Ezio Melotti 265281ac02 #17329: document unittest.SkipTest. Initial patch by Zachary Ware. 2013-03-27 20:11:55 +02:00
Ezio Melotti 89e6b31845 #17504: merge with 3.3. 2013-03-24 16:10:51 +02:00
Ezio Melotti 31a7835df8 #17504: remove duplicated sentence. Patch by Radu Voicilas. 2013-03-24 16:10:24 +02:00
Ezio Melotti cf936c7287 #17510: avoid using deprecated assertEquals method in test_program. Patch by Daniel Black. 2013-03-23 16:46:23 +02:00
Antoine Pitrou c9b3ef2df0 Issue #16997: unittest.TestCase now provides a subTest() context manager to procedurally generate, in an easy way, small test instances. 2013-03-20 20:16:47 +01:00
Michael Foord 04cbe0c35b Closes issue 17467. Add readline and readlines support to unittest.mock.mock_open 2013-03-19 17:22:51 -07:00
Michael Foord 80cbc9e998 Closes issue 16709. unittest test discovery sorts test files for consistent test ordering 2013-03-18 17:50:12 -07:00
Terry Jan Reedy 8b53559a89 Merge with 3.3, issue #17047: remove doubled words added in 3.3, 
as reported by Serhiy Storchaka and Matthew Barnett.
 2013-03-11 18:36:38 -04:00
Terry Jan Reedy 0f84764a09 Issue #17047: remove doubled words added in 3.3 
as reported by Serhiy Storchaka and Matthew Barnett.
 2013-03-11 18:34:00 -04:00
Ezio Melotti eae2b38948 #16935: unittest now counts the module as skipped if it raises SkipTest, instead of counting it as an error. Patch by Zachary Ware. 2013-03-01 14:47:50 +02:00
Petri Lehtinen 20054477f4 Issue #15132: Allow a list for the defaultTest argument of unittest.TestProgram 
Patch by Jyrki Pulliainen
 2013-02-23 18:55:49 +01:00
Michael Foord 890d72d3c9 Merge. Closes issue 17052. 2013-02-11 13:33:00 +00:00
Michael Foord b71b8ec7b1 Merge 2013-02-11 13:29:58 +00:00
Michael Foord f78f5b11f6 Correction to issue 17052 fix 2013-02-11 13:20:52 +00:00
Michael Foord 4e08f786f0 Merge. Closes issue 17052. 2013-02-11 00:28:02 +00:00
Michael Foord a23a39c07d Merge 2013-02-11 00:18:07 +00:00
Michael Foord 8fd396bd22 Issue 17502: unittest discovery should use self.testLoader 2013-02-11 00:04:24 +00:00
Antoine Pitrou 5c64df70b5 Issue #17015: When it has a spec, a Mock object now inspects its signature when matching calls, so that arguments can be matched positionally or by name. 2013-02-03 00:23:58 +01:00
Michael Foord beb29b1f6c Merge 2013-01-29 23:18:48 +00:00
Michael Foord d1da29c99d Merge 2013-01-29 23:14:59 +00:00
Michael Foord 6debd76939 Closes issue 15505. unittest.installHandler and non-callable signal handlers. 2013-01-29 23:07:57 +00:00
Andrew Svetlov a191959849 Issue #16714: use 'raise' exceptions, don't 'throw'. 
Patch by Serhiy Storchaka.
 2012-12-18 21:27:16 +02:00
Andrew Svetlov 5b89840d9c Issue #16714: use 'raise' exceptions, don't 'throw'. 
Patch by Serhiy Storchaka.
 2012-12-18 21:26:36 +02:00
Andrew Svetlov 737fb89dd1 Issue #16714: use 'raise' exceptions, don't 'throw'. 
Patch by Serhiy Storchaka.
 2012-12-18 21:14:22 +02:00
Ezio Melotti dee9043423 #16433: merge with 3.3. 2012-11-08 11:09:28 +02:00
Ezio Melotti 9cfa1ff891 #16433: merge with 3.2. 2012-11-08 11:09:13 +02:00
Ezio Melotti 90eea97a33 #16433: fix docstring of assertNotEqual. 2012-11-08 11:08:39 +02:00
Benjamin Peterson 29e02a2be8 merge 3.3 2012-10-09 11:16:13 -04:00
Benjamin Peterson b29614e047 compare singletons by identity not equality (closes #16712) 
Patch from Serhiy Storchaka.
 2012-10-09 11:16:03 -04:00
Andrew Svetlov 7d14015e62 Issue #16120: Use |yield from| in stdlib. 
Patch by Berker Peksag.
 2012-10-06 17:11:45 +03:00
Michael Foord 28d591ceef Closes issue 15323. Improve failure message of Mock.assert_called_once_with 2012-09-28 16:15:22 +01:00
Michael Foord 8ef1fcecc5 Merge 2012-09-28 15:19:45 +01:00
Michael Foord d38e6e516d Closes issue 16064. No longer hard code executable name in unittest help output. 2012-09-28 15:14:37 +01:00
Michael Foord 7a1901f861 Closes issue #12376 : Pass on parameters in unittest.TextTestResult.__init__ super call 2012-09-28 14:14:03 +01:00
Michael Foord f7c4158057 Adding patch.stopall method to unittest.mock 2012-06-10 20:36:32 +01:00
Michael Foord 75963643b1 Fix exception when calling reset_mock on a mock created with autospec 2012-06-09 17:31:59 +01:00
Nick Coghlan 0b43bcf528 Close #14857: fix regression in references to PEP 3135 implicit __class__ closure variable. Reopens issue #12370, but also updates unittest.mock to workaround that issue 2012-05-27 18:17:07 +10:00
Antoine Pitrou f99983dacb Issue #14664: It is now possible to use @unittest.skip{If,Unless} on a test class that doesn't inherit from TestCase (i.e. a mixin). 2012-04-25 14:58:17 +02:00
Antoine Pitrou b05ac864f0 Issue #14664: It is now possible to use @unittest.skip{If,Unless} on a test class that doesn't inherit from TestCase (i.e. a mixin). 2012-04-25 14:56:46 +02:00
Michael Foord 9cf5c9d85e Remove incorrect comment 2012-04-21 18:32:56 +01:00
Michael Foord 3af125a4aa Closes issue 14634. unittest.mock.create_autospec now supports keyword only arguments. 2012-04-21 18:22:28 +01:00
Michael Foord 2cd48738ba Closes issue 14636. mock objects raise exceptions from an iterable side_effect 2012-04-21 15:52:11 +01:00
Michael Foord 0682a0c0a9 Minor docstring / docs corrections for unittest.mock 2012-04-13 20:51:20 +01:00
Michael Foord 656319e58d Make unittest.mock.create_autospec resilient against AttributeError on original object 2012-04-13 17:39:16 +01:00
Michael Foord c287062fcf unittest.mock.PropertyMock return value and attributes are now standard MagicMocks 2012-04-13 16:57:22 +01:00
Michael Foord aa8ec7e076 Fix unittest.mock.patch docstring 2012-03-28 15:41:28 +01:00
Michael Foord 54b3db8c84 Minor unittest.mock.patch doc / docstring improvement 2012-03-28 15:08:08 +01:00
Michael Foord 0340ea77d1 unittest.mock: removed another bit of Python 2 only code 2012-03-25 23:27:12 +01:00
Michael Foord 944e02d055 Adding unittest.mock documentation 2012-03-25 23:12:55 +01:00
Michael Foord e58a562d93 unittest.mock: a mock created by patch with a spec as the list argument will be callable if __call__ is in the spec 2012-03-25 19:53:18 +01:00
Michael Foord fb5d0a78cf unittest.mock: remove another piece of Python 2 specific code 2012-03-25 19:35:22 +01:00
Michael Foord 1ab27c6fde Remove more Python 2 code from unittest.mock (obsolete function attributes) 2012-03-25 19:16:10 +01:00
Michael Foord 0dccf657b5 Minor changes to the unittest.mock.mock_open helper 2012-03-25 19:11:50 +01:00
Michael Foord 99254730b2 Addition of docstrings to unittest.mock helpers 2012-03-25 19:07:33 +01:00
Michael Foord a74561a56d unittest.mock: set file_spec on first use 2012-03-25 19:03:13 +01:00
Michael Foord 50a8c0ef5d Support subclassing unittest.mock._patch and fix various obscure bugs around patcher spec arguments 2012-03-25 18:57:58 +01:00
Michael Foord 313f85f0ca unittest.mock.MagicMock objects are now unorderable by default 2012-03-25 18:16:07 +01:00
Michael Foord d7c65e2807 Removed XXX from unittest.mock docstring and switch to a nicer try...except...finally 2012-03-14 14:56:54 -07:00
Michael Foord a74b3aa0cc Remove more Python 2 compatibility cruft from unittest.mock 2012-03-14 14:40:22 -07:00
Michael Foord c17adf4151 Remove Python 2 compatibility cruft from unittest.mock 2012-03-14 13:30:29 -07:00
Michael Foord ebff097937 And another one... mock import fix. 2012-03-14 13:01:31 -07:00
Michael Foord 83a16856ee Fix another mock import 2012-03-14 12:58:46 -07:00
Michael Foord 0ca9acd1dd Fix import failure in mock test 2012-03-14 12:38:06 -07:00
Michael Foord 345266aa7e PEP 417: Adding unittest.mock 2012-03-14 12:24:34 -07:00
Michael Foord 5738e4f3df Merge 2012-03-13 00:14:19 -07:00
Michael Foord e01c62cd6b Fix unittest test discovery for Jython 2012-03-13 00:09:54 -07:00
Michael Foord b36c70c9ff Move adding unittest test discovery command line options into their own method. 2012-03-12 15:24:46 -07:00
Michael Foord 5f99ced092 Refactor unittest command line handling to always use optparse 2012-03-12 13:53:04 -07:00
Senthil Kumaran 5d036e1ccf merge from 3.2 testFnNames is assigned twice. 2011-11-25 02:09:24 +08:00
Senthil Kumaran f27be5c60b testFnNames is assigned twice. 2011-11-25 02:08:39 +08:00
Florent Xicluna c53ae58954 Drop unused import in unittest package. 2011-11-04 08:25:54 +01:00
Florent Xicluna 5d1155c08e Closes #13258: Use callable() built-in in the standard library. 2011-10-28 14:45:05 +02:00
Florent Xicluna aabbda5354 Merge 3.2 2011-10-28 14:52:29 +02:00
Ezio Melotti d8b509b192 #13012: use splitlines(keepends=True/False) instead of splitlines(0/1). 2011-09-28 17:37:55 +03:00
Benjamin Peterson b6ffa7980f test that TestCase doesn't get cycles 2011-07-14 12:48:25 -05:00
Benjamin Peterson 0850638957 merge 3.2 (#12544) 2011-07-12 19:23:43 -05:00
Benjamin Peterson 34b2b263db this can be done without a custom dict (also fixes #12544) 2011-07-12 19:21:42 -05:00
Ezio Melotti b4dc2502ad Issue #10775: assertRaises, assertRaisesRegex, assertWarns, and assertWarnsRegex now accept a keyword argument 'msg' when used as context managers. Initial patch by Winston Ewert. 2011-05-06 15:01:41 +03:00
Ezio Melotti 9490af2150 #11763: merge with 3.2. 2011-04-27 10:21:51 +03:00
Ezio Melotti edd117fd27 #11763: merge with 3.1. 2011-04-27 10:20:38 +03:00
Ezio Melotti 0f535013c5 #11282: add back the fail* methods and assertDictContainsSubset. 2011-04-03 18:02:13 +03:00
Ezio Melotti b7af620747 #11282: merge with 3.2. 2011-04-03 17:39:19 +03:00
Ezio Melotti 361467e522 #11282: the fail* methods will stay around a few more versions. 2011-04-03 17:37:58 +03:00
Ezio Melotti 45763d0d12 Merge with 3.2. 2011-03-20 15:34:28 +02:00
Ezio Melotti 60c3c9f918 Save a copy of sys.warnoptions in test_program. 2011-03-20 15:31:26 +02:00
Michael Foord 42ec7cb105 Issue #10979. unittest stdout buffering now works with class and module setup and teardown. 2011-03-17 13:44:18 -04:00
Victor Stinner 98dbba5d20 Issue #3080: Use repr() to format the module name on error 2011-03-14 15:15:47 -04:00
Michael Foord e9ff2ef204 Closes issue 10979. unittest buffering now works with class and module setup and teardown 2011-03-17 13:58:22 -04:00
Michael Foord 1341bb0019 Closes issue 11407. TestCase.run returns the result object used or created 2011-03-14 19:01:46 -04:00
Georg Brandl 2cebdd4865 Remove unittest methods scheduled for removal in 3.3 -- makes the unittest test suite pass again. 2011-02-20 11:18:09 +00:00
Michael Foord e180d3953f Issue 10573: revert unittest docs to first / second 
Minor internal change to unittest.TestCase.assertCountEqual
Reviewed by R. David Murray
 2011-01-28 19:51:48 +00:00
Victor Stinner cae969e70a fix test_unittest: ignore DeprecationWarning on assertDictContainsSubset() 2011-01-03 23:56:12 +00:00
Michael Foord 32e1d8340c Enable unittest.TestCase to be instantiated without providing a method name. 
Changed unittestgui to show number of discovered tests in the status bar.
 2011-01-03 17:00:11 +00:00
Michael Foord 6f17e2df29 Issue 10786: unittest.TextTestRunner default stream no longer bound at import time 2010-12-30 19:36:29 +00:00
Raymond Hettinger 57bd00a15b Adopt symmetric names for arguments (actual/expected --> first/second). 2010-12-24 21:51:48 +00:00
Raymond Hettinger efbcb1b038 Keep helper functions private. 2010-12-24 11:24:00 +00:00
Raymond Hettinger 9d668dac68 Put diff output in useful order (when the elements were first seen). 2010-12-24 11:20:30 +00:00
Raymond Hettinger f954217458 Add direct tests for the util functions. 2010-12-24 10:30:06 +00:00
Raymond Hettinger 93e233d6e5 Improve diff for assertCountEqual() to actually show the differing counts. 
New output looks like this:

Traceback (most recent call last):
  File "test.py", line 5, in test_ce
    self.assertCountEqual('abracadabra xx', 'simsalabim xx')
AssertionError: Element counts were not equal:
Expected 5, got 2:  'a'
Expected 2, got 1:  'b'
Expected 0, got 2:  'i'
Expected 0, got 2:  'm'
Expected 0, got 1:  'l'
Expected 0, got 2:  's'
Expected 1, got 0:  'c'
Expected 1, got 0:  'd'
Expected 2, got 0:  'r'
 2010-12-24 10:02:22 +00:00
Raymond Hettinger c44befb82e Fix docstring. 2010-12-24 00:58:34 +00:00
Raymond Hettinger 6518f5e780 Fix docs and comment for r87454. 2010-12-24 00:52:54 +00:00
Raymond Hettinger 83961245b4 Add test for r87454. 2010-12-24 00:48:47 +00:00
Raymond Hettinger d65a901aed Fix buglet. If the input was an iterator, the fallback would occur after 
part of the iterator had been consumed.   Also, fix argument names which
did not match the docs and were a bit misleading.
 2010-12-23 21:54:02 +00:00
Raymond Hettinger 8ebe27f300 Deprecate assertDictContainsSubset() 2010-12-21 19:24:26 +00:00
Michael Foord cca5be2e4c Improvement to fix for issue 9926 to allow TestResult to be reused. 2010-12-19 04:07:28 +00:00
Michael Foord f100dbd600 Fix minor issue in implementation of issue 10470. 2010-12-19 03:59:10 +00:00
Michael Foord b3468f79ef Issue 10611. Issue 9857. Improve the way exception handling, including test skipping, is done inside TestCase.run 2010-12-19 03:19:47 +00:00
Ezio Melotti addc6f5a21 #10573: use actual/expected consistently in unittest methods. The order of the args of assertCountEqual is also changed. 2010-12-18 20:00:04 +00:00
Ezio Melotti 3044fa77a5 Use lowercase true/false in assertTrue/assertFalse messages. 2010-12-18 17:31:58 +00:00
Gregory P. Smith ed16bf4aaa assert that the regex given to assertRegex is non-empty. 2010-12-16 19:23:05 +00:00
Ezio Melotti 8f77630747 #10273: Remove a "Matches" that I missed in r86910. Thanks to RDM for noticing it. 2010-12-10 02:32:05 +00:00
Michael Foord 36526bf3d9 Correct comment in unittest test 2010-12-04 01:43:59 +00:00
Michael Foord 37d120aeb4 Issue 10620: Specifying test modules by path instead of module name to 'python -m unittest' 2010-12-04 01:11:21 +00:00
Michael Foord 5074df623b Issue 7911: unittest.TestCase.longMessage defaults to True for improved failure messages by default 2010-12-03 00:53:09 +00:00
Ezio Melotti ed3a7d2d60 #10273: Rename assertRegexpMatches and assertRaisesRegexp to assertRegex and assertRaisesRegex. 2010-12-01 02:32:32 +00:00
Ezio Melotti f10c400b91 Fix test failure in debug builds and add NEWS entry for r86908 2010-12-01 01:45:53 +00:00
Ezio Melotti 6090187656 #10535: Enable silenced warnings in unittest by default 2010-12-01 00:56:10 +00:00
Raymond Hettinger 40b8cf528f Do not add an obsolete unittest name to Py3.2. 2010-11-29 01:38:25 +00:00
Raymond Hettinger 6e165b30de Issue 10242: unittest.assertItemsEqual makes too many assumptions. 2010-11-27 09:31:37 +00:00
Ezio Melotti 2baf1a69f4 #9424: add a DeprecationWarning for assertEquals, assertNotEquals, assertAlmostEquals, assertNotAlmostEquals, and assert_ 2010-11-22 12:56:58 +00:00
Michael Foord b87ef8f872 Improve test for 'python -m unittest' launching test discovery 2010-11-22 10:41:27 +00:00
Michael Foord 086f30815c Issue 10470: 'python -m unittest' launches test discovery by default.(If you need to pass options to test discovery the discover subcommand must still be specified explicitly.) 2010-11-21 21:28:01 +00:00
Ezio Melotti b3aedd4862 #9424: Replace deprecated assert* methods in the Python test suite. 2010-11-20 19:04:17 +00:00
Michael Foord 6bcfadec07 Improve unittest.TestLoader.discover docstring 2010-11-20 17:22:21 +00:00
Michael Foord b357fb7bed Issue 10326: further extend test for unpickling to ensure type lookup mechanism works after unpickling 2010-11-20 15:47:56 +00:00
Michael Foord 8a00eec2a8 Issue 10326: extend test for pickling of TestCase instances to ensure they can be unpickled too 2010-11-20 15:43:02 +00:00
Michael Foord 8ca6d9884b Issue 10326: TestCase instances can now be pickled (they store names of instance methods instead of references to the instance methods themselves). 2010-11-20 15:34:26 +00:00
Benjamin Peterson 29bd840dee reduce try block compass 2010-11-18 14:14:43 +00:00
Michael Foord 321d059147 Remove the keyword only restriction for places and delta args in unittest.TestCase.assert[Not]AlmostEqual 2010-11-02 13:44:51 +00:00
Michael Foord bbea35f194 Fix issue 9926. TestSuite subclasses that override __call__ are called correctly. 2010-11-01 21:09:03 +00:00
Antoine Pitrou 4bc12ef47d Issue #9754: Similarly to assertRaises and assertRaisesRegexp, unittest 
test cases now also have assertWarns and assertWarnsRegexp methods to
check that a given warning type was triggered by the code under test.
 2010-09-06 19:25:46 +00:00
Michael Foord c653ce313f Fix error message for comparing single line strings in unittest.TestCase.assertEqual. 
Issue 9174.
 2010-07-10 13:52:22 +00:00
Michael Foord 2b293cf1a5 Merged revisions 81878 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81878 | michael.foord | 2010-06-10 21:40:21 +0100 (Thu, 10 Jun 2010) | 2 lines

  Fix issue with nested test suites debug method and module setups. (unittest)
........
 2010-06-10 20:41:54 +00:00
Michael Foord c41d141f4f Merged revisions 81859 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81859 | michael.foord | 2010-06-09 13:29:56 +0100 (Wed, 09 Jun 2010) | 1 line

  Typo correction.
........
 2010-06-10 16:17:07 +00:00