Mailman 3 February 2010 - Python-checkins

r78517 - in python/trunk: Lib/test/test_threading.py Lib/threading.py Misc/NEWS
by gregory.p.smith March 1, 2010

March 1, 2010

Author: gregory.p.smith Date: Sun Feb 28 19:36:09 2010 New Revision: 78517 Log: Issue #7481: When a threading.Thread failed to start it would leave the instance stuck in initial state and present in threading.enumerate(). Modified: python/trunk/Lib/test/test_threading.py python/trunk/Lib/threading.py python/trunk/Misc/NEWS Modified: python/trunk/Lib/test/test_threading.py ============================================================================== --- python/trunk/Lib/test/test_threading.py (original) +++ python/trunk/Lib/test/test_threading.py Sun Feb 28 19:36:09 2010 @@ -249,6 +249,25 @@ t.join() # else the thread is still running, and we have no way to kill it + def test_limbo_cleanup(self): + # Issue 7481: Failure to start thread should cleanup the limbo map. + def fail_new_thread(*args): + raise thread.error() + _start_new_thread = threading._start_new_thread + threading._start_new_thread = fail_new_thread + try: + t = threading.Thread(target=lambda: None) + try: + t.start() + assert False + except thread.error: + self.assertFalse( + t in threading._limbo, + "Failed to cleanup _limbo map on failure of Thread.start()." + ) + finally: + threading._start_new_thread = _start_new_thread + def test_finalize_runnning_thread(self): # Issue 1402: the PyGILState_Ensure / _Release functions may be called # very late on python exit: on deallocation of a running thread for Modified: python/trunk/Lib/threading.py ============================================================================== --- python/trunk/Lib/threading.py (original) +++ python/trunk/Lib/threading.py Sun Feb 28 19:36:09 2010 @@ -469,7 +469,12 @@ self._note("%s.start(): starting thread", self) with _active_limbo_lock: _limbo[self] = self - _start_new_thread(self.__bootstrap, ()) + try: + _start_new_thread(self.__bootstrap, ()) + except Exception: + with _active_limbo_lock: + del _limbo[self] + raise self.__started.wait() def run(self): Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Feb 28 19:36:09 2010 @@ -72,6 +72,9 @@ - Issue #7427: improve the representation of httplib.BadStatusLine exceptions. +- Issue #7481: When a threading.Thread failed to start it would leave the + instance stuck in initial state and present in threading.enumerate(). + Extension Modules -----------------

2 1

r78522 - in python/trunk/Objects: dictobject.c listobject.c tupleobject.c
by ezio.melotti Feb. 28, 2010

Feb. 28, 2010

Author: ezio.melotti Date: Mon Mar 1 00:59:00 2010 New Revision: 78522 Log: #8030: more docstring fix for builtin types. Modified: python/trunk/Objects/dictobject.c python/trunk/Objects/listobject.c python/trunk/Objects/tupleobject.c Modified: python/trunk/Objects/dictobject.c ============================================================================== --- python/trunk/Objects/dictobject.c (original) +++ python/trunk/Objects/dictobject.c Mon Mar 1 00:59:00 2010 @@ -2327,9 +2327,9 @@ } PyDoc_STRVAR(dictionary_doc, -"dict() -> new empty dictionary.\n" +"dict() -> new empty dictionary\n" "dict(mapping) -> new dictionary initialized from a mapping object's\n" -" (key, value) pairs.\n" +" (key, value) pairs\n" "dict(iterable) -> new dictionary initialized as if via:\n" " d = {}\n" " for k, v in iterable:\n" Modified: python/trunk/Objects/listobject.c ============================================================================== --- python/trunk/Objects/listobject.c (original) +++ python/trunk/Objects/listobject.c Mon Mar 1 00:59:00 2010 @@ -2536,7 +2536,7 @@ }; PyDoc_STRVAR(list_doc, -"list() -> new list\n" +"list() -> new empty list\n" "list(iterable) -> new list initialized from iterable's items"); Modified: python/trunk/Objects/tupleobject.c ============================================================================== --- python/trunk/Objects/tupleobject.c (original) +++ python/trunk/Objects/tupleobject.c Mon Mar 1 00:59:00 2010 @@ -681,10 +681,10 @@ } PyDoc_STRVAR(tuple_doc, -"tuple() -> an empty tuple\n" -"tuple(sequence) -> tuple initialized from sequence's items\n" -"\n" -"If the argument is a tuple, the return value is the same object."); +"tuple() -> empty tuple\n\ +tuple(iterable) -> tuple initialized from iterable's items\n\ +\n\ +If the argument is a tuple, the return value is the same object."); static PySequenceMethods tuple_as_sequence = { (lenfunc)tuplelength, /* sq_length */

1 0

r78521 - in python/branches/release31-maint: Doc/library/unittest.rst
by gregory.p.smith Feb. 28, 2010

Feb. 28, 2010

Author: gregory.p.smith Date: Sun Feb 28 23:01:02 2010 New Revision: 78521 Log: (really issue7832, not 7030) Merged revisions 77998 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77998 | michael.foord | 2010-02-05 12:54:27 -0800 (Fri, 05 Feb 2010) | 9 lines Merged revisions 77997 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77997 | michael.foord | 2010-02-05 20:52:14 +0000 (Fri, 05 Feb 2010) | 1 line Closes issue 7030. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/library/unittest.rst Modified: python/branches/release31-maint/Doc/library/unittest.rst ============================================================================== --- python/branches/release31-maint/Doc/library/unittest.rst (original) +++ python/branches/release31-maint/Doc/library/unittest.rst Sun Feb 28 23:01:02 2010 @@ -729,12 +729,16 @@ .. versionadded:: 3.1 - .. method:: assertSameElements(expected, actual, msg=None) + .. method:: assertSameElements(actual, expected, msg=None) Test that sequence *expected* contains the same elements as *actual*, regardless of their order. When they don't, an error message listing the differences between the sequences will be generated. + Duplicate elements are ignored when comparing *actual* and *expected*. + It is the equivalent of ``assertEqual(set(expected), set(actual))`` + but it works with sequences of unhashable objects as well. + If specified *msg* will be used as the error message on failure. .. versionadded:: 3.1

1 0

r78520 - in python/branches/release31-maint: Lib/test/test_threading.py Lib/threading.py Misc/NEWS
by gregory.p.smith Feb. 28, 2010

Feb. 28, 2010

Author: gregory.p.smith Date: Sun Feb 28 20:21:42 2010 New Revision: 78520 Log: Merged revisions 78519 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78519 | gregory.p.smith | 2010-02-28 10:57:46 -0800 (Sun, 28 Feb 2010) | 10 lines Merged revisions 78517 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78517 | gregory.p.smith | 2010-02-28 10:36:09 -0800 (Sun, 28 Feb 2010) | 3 lines Issue #7481: When a threading.Thread failed to start it would leave the instance stuck in initial state and present in threading.enumerate(). ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/test/test_threading.py python/branches/release31-maint/Lib/threading.py python/branches/release31-maint/Misc/NEWS Modified: python/branches/release31-maint/Lib/test/test_threading.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_threading.py (original) +++ python/branches/release31-maint/Lib/test/test_threading.py Sun Feb 28 20:21:42 2010 @@ -221,6 +221,25 @@ t.join() # else the thread is still running, and we have no way to kill it + def test_limbo_cleanup(self): + # Issue 7481: Failure to start thread should cleanup the limbo map. + def fail_new_thread(*args): + raise threading.ThreadError() + _start_new_thread = threading._start_new_thread + threading._start_new_thread = fail_new_thread + try: + t = threading.Thread(target=lambda: None) + try: + t.start() + assert False + except threading.ThreadError: + self.assertFalse( + t in threading._limbo, + "Failed to cleanup _limbo map on failure of Thread.start()." + ) + finally: + threading._start_new_thread = _start_new_thread + def test_finalize_runnning_thread(self): # Issue 1402: the PyGILState_Ensure / _Release functions may be called # very late on python exit: on deallocation of a running thread for Modified: python/branches/release31-maint/Lib/threading.py ============================================================================== --- python/branches/release31-maint/Lib/threading.py (original) +++ python/branches/release31-maint/Lib/threading.py Sun Feb 28 20:21:42 2010 @@ -455,7 +455,12 @@ self._note("%s.start(): starting thread", self) with _active_limbo_lock: _limbo[self] = self - _start_new_thread(self._bootstrap, ()) + try: + _start_new_thread(self._bootstrap, ()) + except Exception: + with _active_limbo_lock: + del _limbo[self] + raise self._started.wait() def run(self): Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Sun Feb 28 20:21:42 2010 @@ -332,6 +332,9 @@ - Issue #7066: archive_util.make_archive now restores the cwd if an error is raised. Initial patch by Ezio Melotti. +- Issue #7481: When a threading.Thread failed to start it would leave the + instance stuck in initial state and present in threading.enumerate(). + Extension Modules -----------------

1 0

r78519 - in python/branches/py3k: Lib/test/test_threading.py Lib/threading.py Misc/NEWS
by gregory.p.smith Feb. 28, 2010

Feb. 28, 2010

Author: gregory.p.smith Date: Sun Feb 28 19:57:46 2010 New Revision: 78519 Log: Merged revisions 78517 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78517 | gregory.p.smith | 2010-02-28 10:36:09 -0800 (Sun, 28 Feb 2010) | 3 lines Issue #7481: When a threading.Thread failed to start it would leave the instance stuck in initial state and present in threading.enumerate(). ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_threading.py python/branches/py3k/Lib/threading.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/test/test_threading.py ============================================================================== --- python/branches/py3k/Lib/test/test_threading.py (original) +++ python/branches/py3k/Lib/test/test_threading.py Sun Feb 28 19:57:46 2010 @@ -247,6 +247,25 @@ t.join() # else the thread is still running, and we have no way to kill it + def test_limbo_cleanup(self): + # Issue 7481: Failure to start thread should cleanup the limbo map. + def fail_new_thread(*args): + raise threading.ThreadError() + _start_new_thread = threading._start_new_thread + threading._start_new_thread = fail_new_thread + try: + t = threading.Thread(target=lambda: None) + try: + t.start() + assert False + except threading.ThreadError: + self.assertFalse( + t in threading._limbo, + "Failed to cleanup _limbo map on failure of Thread.start()." + ) + finally: + threading._start_new_thread = _start_new_thread + def test_finalize_runnning_thread(self): # Issue 1402: the PyGILState_Ensure / _Release functions may be called # very late on python exit: on deallocation of a running thread for Modified: python/branches/py3k/Lib/threading.py ============================================================================== --- python/branches/py3k/Lib/threading.py (original) +++ python/branches/py3k/Lib/threading.py Sun Feb 28 19:57:46 2010 @@ -465,7 +465,12 @@ self._note("%s.start(): starting thread", self) with _active_limbo_lock: _limbo[self] = self - _start_new_thread(self._bootstrap, ()) + try: + _start_new_thread(self._bootstrap, ()) + except Exception: + with _active_limbo_lock: + del _limbo[self] + raise self._started.wait() def run(self): Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Feb 28 19:57:46 2010 @@ -711,6 +711,9 @@ - The os.get_exec_path() function to return the list of directories that will be searched for an executable when launching a subprocess was added. +- Issue #7481: When a threading.Thread failed to start it would leave the + instance stuck in initial state and present in threading.enumerate(). + Extension Modules -----------------

1 0

r78518 - in python/branches/release26-maint: Lib/test/test_threading.py Lib/threading.py Misc/NEWS
by gregory.p.smith Feb. 28, 2010

Feb. 28, 2010

Author: gregory.p.smith Date: Sun Feb 28 19:40:12 2010 New Revision: 78518 Log: Merged revisions 78517 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78517 | gregory.p.smith | 2010-02-28 10:36:09 -0800 (Sun, 28 Feb 2010) | 3 lines Issue #7481: When a threading.Thread failed to start it would leave the instance stuck in initial state and present in threading.enumerate(). ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/test/test_threading.py python/branches/release26-maint/Lib/threading.py python/branches/release26-maint/Misc/NEWS Modified: python/branches/release26-maint/Lib/test/test_threading.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_threading.py (original) +++ python/branches/release26-maint/Lib/test/test_threading.py Sun Feb 28 19:40:12 2010 @@ -219,6 +219,25 @@ t.join() # else the thread is still running, and we have no way to kill it + def test_limbo_cleanup(self): + # Issue 7481: Failure to start thread should cleanup the limbo map. + def fail_new_thread(*args): + raise thread.error() + _start_new_thread = threading._start_new_thread + threading._start_new_thread = fail_new_thread + try: + t = threading.Thread(target=lambda: None) + try: + t.start() + assert False + except thread.error: + self.assertFalse( + t in threading._limbo, + "Failed to cleanup _limbo map on failure of Thread.start()." + ) + finally: + threading._start_new_thread = _start_new_thread + def test_finalize_runnning_thread(self): # Issue 1402: the PyGILState_Ensure / _Release functions may be called # very late on python exit: on deallocation of a running thread for Modified: python/branches/release26-maint/Lib/threading.py ============================================================================== --- python/branches/release26-maint/Lib/threading.py (original) +++ python/branches/release26-maint/Lib/threading.py Sun Feb 28 19:40:12 2010 @@ -470,7 +470,12 @@ _active_limbo_lock.acquire() _limbo[self] = self _active_limbo_lock.release() - _start_new_thread(self.__bootstrap, ()) + try: + _start_new_thread(self.__bootstrap, ()) + except Exception: + with _active_limbo_lock: + del _limbo[self] + raise self.__started.wait() def run(self): Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Sun Feb 28 19:40:12 2010 @@ -232,6 +232,9 @@ - Issue #5037: Proxy the __unicode__ special method to __unicode__ instead of __str__. +- Issue #7481: When a threading.Thread failed to start it would leave the + instance stuck in initial state and present in threading.enumerate(). + Extension Modules -----------------

1 0

r78516 - python/trunk/Objects/setobject.c
by georg.brandl Feb. 28, 2010

Feb. 28, 2010

Author: georg.brandl Date: Sun Feb 28 19:26:37 2010 New Revision: 78516 Log: The set types can also be called without arguments. Modified: python/trunk/Objects/setobject.c Modified: python/trunk/Objects/setobject.c ============================================================================== --- python/trunk/Objects/setobject.c (original) +++ python/trunk/Objects/setobject.c Sun Feb 28 19:26:37 2010 @@ -2102,7 +2102,8 @@ }; PyDoc_STRVAR(set_doc, -"set(iterable) -> new set object\n\ +"set() -> new empty set object\n\ +set(iterable) -> new set object\n\ \n\ Build an unordered collection of unique elements."); @@ -2200,7 +2201,8 @@ }; PyDoc_STRVAR(frozenset_doc, -"frozenset(iterable) -> frozenset object\n\ +"frozenset() -> empty frozenset object\n\ +frozenset(iterable) -> frozenset object\n\ \n\ Build an immutable unordered collection of unique elements.");

1 0

r78515 - in python/trunk/Objects: dictobject.c listobject.c setobject.c
by georg.brandl Feb. 28, 2010

Feb. 28, 2010

Author: georg.brandl Date: Sun Feb 28 19:19:17 2010 New Revision: 78515 Log: #8030: make builtin type docstrings more consistent: use "iterable" instead of "seq(uence)", use "new" to show that set() always returns a new object. Modified: python/trunk/Objects/dictobject.c python/trunk/Objects/listobject.c python/trunk/Objects/setobject.c Modified: python/trunk/Objects/dictobject.c ============================================================================== --- python/trunk/Objects/dictobject.c (original) +++ python/trunk/Objects/dictobject.c Sun Feb 28 19:19:17 2010 @@ -2330,9 +2330,9 @@ "dict() -> new empty dictionary.\n" "dict(mapping) -> new dictionary initialized from a mapping object's\n" " (key, value) pairs.\n" -"dict(seq) -> new dictionary initialized as if via:\n" +"dict(iterable) -> new dictionary initialized as if via:\n" " d = {}\n" -" for k, v in seq:\n" +" for k, v in iterable:\n" " d[k] = v\n" "dict(**kwargs) -> new dictionary initialized with the name=value pairs\n" " in the keyword argument list. For example: dict(one=1, two=2)"); Modified: python/trunk/Objects/listobject.c ============================================================================== --- python/trunk/Objects/listobject.c (original) +++ python/trunk/Objects/listobject.c Sun Feb 28 19:19:17 2010 @@ -2537,7 +2537,7 @@ PyDoc_STRVAR(list_doc, "list() -> new list\n" -"list(sequence) -> new list initialized from sequence's items"); +"list(iterable) -> new list initialized from iterable's items"); static PyObject * Modified: python/trunk/Objects/setobject.c ============================================================================== --- python/trunk/Objects/setobject.c (original) +++ python/trunk/Objects/setobject.c Sun Feb 28 19:19:17 2010 @@ -2102,7 +2102,7 @@ }; PyDoc_STRVAR(set_doc, -"set(iterable) --> set object\n\ +"set(iterable) -> new set object\n\ \n\ Build an unordered collection of unique elements."); @@ -2200,7 +2200,7 @@ }; PyDoc_STRVAR(frozenset_doc, -"frozenset(iterable) --> frozenset object\n\ +"frozenset(iterable) -> frozenset object\n\ \n\ Build an immutable unordered collection of unique elements.");

1 0

r78501 - peps/trunk/pep-3147.txt
by barry.warsaw Feb. 28, 2010

Feb. 28, 2010

Author: barry.warsaw Date: Sat Feb 27 17:13:06 2010 New Revision: 78501 Log: Add a section discussion the options for bytecode-only packagers. Modified: peps/trunk/pep-3147.txt Modified: peps/trunk/pep-3147.txt ============================================================================== --- peps/trunk/pep-3147.txt (original) +++ peps/trunk/pep-3147.txt Sat Feb 27 17:13:06 2010 @@ -355,12 +355,15 @@ subdirectory in its path. For alternative Python implementations which do not support `pyc` -files, the `__cached__` attribute may point to whatever -version-specific binary file was read for the module code. E.g. on -Jython, this might be the `.class` file for the module: -`__pycache__/foo.jython-32.class`. Alternative implementations for -which this scheme does not make sense should set the `__cached__` -attribute to `None`. +files, the `__cached__` attribute may point to whatever information +makes sense. E.g. on Jython, this might be the `.class` file for the +module: `__pycache__/foo.jython-32.class`. Some implementations may +use multiple files compiled files to create the module, in which case +`__cached__` may be a tuple. The exact contents of `__cached__` are +Python implementation specific. + +Alternative implementations for which this scheme does not make sense +should set the `__cached__` attribute to `None`. File extension checks @@ -475,6 +478,55 @@ implementation remain in sync. +Open issues +=========== + +bytecode-only packages +---------------------- + +Some users of Python distribute packages containing only the byte code +files (pyc). The use cases for this are to make it more difficult for +end-users to view the source code, and to reduce maintenance burdens +when end users casually edit the source files. + +This PEP currently promote no default support for bytecode-only +packages. The primary motivator for this are that we can reduce stat +calls if the importer only looks for .py files, making Python start-up +and import faster. + +The question is how to balance the requirements of bytecode-only users +with the more universally beneficial faster start up times for +requiring source files? Should all Python users pay the extra stat +call penalty in the general case for a minority use case by default? + +There are several ways out of this. Should we decide that it's +important enough to support bytecode-only packages, the semantics +would be as follows: + +* If there is a traditional, non-magic-tagged .pyc file in the + location where a .py file should be found, it will satisfy the + import. +* The `__file__` attribute of the module will point to the .pyc file. +* The `__cached__` attribute of the module will point to the .pyc file + too. +* The existence of a matching `__pycached__/foo.<magic>.pyc` file + without the source py file will *not* satisfy the import. This + means that if the source file is removed, the pyc file will be + ignored (unlike in today's implementation). + +Other ways to satisfy the bytecode-only packagers requirements would +have less impact on the general Python user population, and include: + +* Add a `-X` switch and/or environment variable to enable + the bytecode-only search algorithm. +* Let those who want more protection against casual py hackers package + their code in a zip file, which is supported today. +* Provide a custom importer supporting bytecode-only packages, which + would have to be enabled explicitly by the application. Either + Python would provide such a custom importer or it would be left to + third parties to implement. + + References ==========

2 1

r78514 - in python/branches/release31-maint: Doc/library/unittest.rst
by ezio.melotti Feb. 28, 2010

Feb. 28, 2010

Author: ezio.melotti Date: Sun Feb 28 04:48:50 2010 New Revision: 78514 Log: Merged revisions 78513 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78513 | ezio.melotti | 2010-02-28 05:46:13 +0200 (Sun, 28 Feb 2010) | 9 lines Merged revisions 78511 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78511 | ezio.melotti | 2010-02-28 05:11:07 +0200 (Sun, 28 Feb 2010) | 1 line Pep8ify test names in the examples. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/library/unittest.rst Modified: python/branches/release31-maint/Doc/library/unittest.rst ============================================================================== --- python/branches/release31-maint/Doc/library/unittest.rst (original) +++ python/branches/release31-maint/Doc/library/unittest.rst Sun Feb 28 04:48:50 2010 @@ -162,9 +162,9 @@ Running the revised script from the interpreter or another script produces the following output:: - testchoice (__main__.TestSequenceFunctions) ... ok - testsample (__main__.TestSequenceFunctions) ... ok - testshuffle (__main__.TestSequenceFunctions) ... ok + test_choice (__main__.TestSequenceFunctions) ... ok + test_sample (__main__.TestSequenceFunctions) ... ok + test_shuffle (__main__.TestSequenceFunctions) ... ok ---------------------------------------------------------------------- Ran 3 tests in 0.110s @@ -283,32 +283,32 @@ self.widget.dispose() self.widget = None - def testDefaultSize(self): + def test_default_size(self): self.assertEqual(self.widget.size(), (50,50), 'incorrect default size') - def testResize(self): + def test_resize(self): self.widget.resize(100,150) self.assertEqual(self.widget.size(), (100,150), 'wrong size after resize') Here we have not provided a :meth:`~TestCase.runTest` method, but have instead provided two different test methods. Class instances will now each run one of -the :meth:`test\*` methods, with ``self.widget`` created and destroyed +the :meth:`test_\*` methods, with ``self.widget`` created and destroyed separately for each instance. When creating an instance we must specify the test method it is to run. We do this by passing the method name in the constructor:: - defaultSizeTestCase = WidgetTestCase('testDefaultSize') - resizeTestCase = WidgetTestCase('testResize') + defaultSizeTestCase = WidgetTestCase('test_default_size') + resizeTestCase = WidgetTestCase('test_resize') Test case instances are grouped together according to the features they test. :mod:`unittest` provides a mechanism for this: the :dfn:`test suite`, represented by :mod:`unittest`'s :class:`TestSuite` class:: widgetTestSuite = unittest.TestSuite() - widgetTestSuite.addTest(WidgetTestCase('testDefaultSize')) - widgetTestSuite.addTest(WidgetTestCase('testResize')) + widgetTestSuite.addTest(WidgetTestCase('test_default_size')) + widgetTestSuite.addTest(WidgetTestCase('test_resize')) For the ease of running tests, as we will see later, it is a good idea to provide in each test module a callable object that returns a pre-built test @@ -316,14 +316,14 @@ def suite(): suite = unittest.TestSuite() - suite.addTest(WidgetTestCase('testDefaultSize')) - suite.addTest(WidgetTestCase('testResize')) + suite.addTest(WidgetTestCase('test_default_size')) + suite.addTest(WidgetTestCase('test_resize')) return suite or even:: def suite(): - tests = ['testDefaultSize', 'testResize'] + tests = ['test_default_size', 'test_resize'] return unittest.TestSuite(map(WidgetTestCase, tests)) @@ -334,8 +334,8 @@ suite = unittest.TestLoader().loadTestsFromTestCase(WidgetTestCase) -will create a test suite that will run ``WidgetTestCase.testDefaultSize()`` and -``WidgetTestCase.testResize``. :class:`TestLoader` uses the ``'test'`` method +will create a test suite that will run ``WidgetTestCase.test_default_size()`` and +``WidgetTestCase.test_resize``. :class:`TestLoader` uses the ``'test'`` method name prefix to identify test methods automatically. Note that the order in which the various test cases will be run is @@ -540,8 +540,8 @@ def suite(): suite = unittest.TestSuite() - suite.addTest(WidgetTestCase('testDefaultSize')) - suite.addTest(WidgetTestCase('testResize')) + suite.addTest(WidgetTestCase('test_default_size')) + suite.addTest(WidgetTestCase('test_resize')) return suite Here, we create two instances of :class:`WidgetTestCase`, each of which runs a

1 0