Commit Graph

14648 Commits

Author SHA1 Message Date
Georg Brandl 4d4313d59d #5142: add module skipping feature to pdb. 2009-05-05 08:54:11 +00:00
Georg Brandl 7c26d76d9c #1309567: fix linecache behavior of stripping subdirectories from paths when looking for relative filename matches. Also add a linecache test suite. 2009-05-05 08:28:49 +00:00
Georg Brandl f71ba95e91 #5932: fix error return in _convertPyInt_AsSsize_t() conversion function. 2009-05-05 07:48:12 +00:00
Steven Bethard ab538fc2b2 Update bdist_msi so that the generated MSIs for pure Python modules can install to any version of Python, like the generated EXEs from bdist_wininst. (Previously, you had to create a new MSI for each version of Python.) 2009-05-05 01:31:22 +00:00
Benjamin Peterson 7c67b03051 using sys._getframe(x), where x > 0 doesnt' work on IronPython 2009-05-05 00:55:24 +00:00
R. David Murray 7ba8e1cbfd Fix issue 5890: (property subclass shadows __doc__ string) by inserting
the __doc__ into the subclass instance __dict__.  The fix refactors
property_copy to call property_init in such a way that the __doc__
logic is re-executed correctly when getter_doc is 1, thus simplifying
property_copy.
2009-05-04 22:16:24 +00:00
Antoine Pitrou 97377bf566 Issue #5692: In :class:`zipfile.Zipfile`, fix wrong path calculation when extracting a file to the root directory. 2009-05-04 21:17:17 +00:00
Antoine Pitrou 653dece278 Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Patch by Nick Barnes and Victor Stinner.
2009-05-04 18:32:32 +00:00
Walter Dörwald 2827709d6d Fix typos. 2009-05-04 16:03:03 +00:00
Gregory P. Smith d02eedacab Issue #4751: For hashlib algorithms provided by OpenSSL, the Python
GIL is now released during computation on data lengths >= 2048 bytes.
2009-05-04 00:16:49 +00:00
Gregory P. Smith 4bd76641b8 docstring update. 2009-05-03 20:27:25 +00:00
Gregory P. Smith 9ac3ee63f6 Optimization: move RFC defined network constant construction out of
the is_*() methods and into module private instances.
2009-05-03 19:37:05 +00:00
Kurt B. Kaiser 62e9a653b5 Further development of issue5559, handle Windows files
which not only have embedded spaces, but leading spaces.
2009-05-03 02:05:22 +00:00
Kurt B. Kaiser 106ac46b3f idle.py modified and simplified to better support
developing experimental versions of IDLE which are
not installed in the standard location.
2009-05-03 01:03:44 +00:00
Michael Foord 07ef487a96 2009-05-02 22:43:34 +00:00
Antoine Pitrou 7430989cda Isue #5084: unpickling now interns the attribute names of pickled objects,
saving memory and avoiding growth in size of subsequent pickles. Proposal
and original patch by Jake McGuire.
2009-05-02 21:13:23 +00:00
Michael Foord e2fb98f467 Add addCleanup and doCleanups to unittest.TestCase.
Closes issue 5679.

Michael Foord
2009-05-02 20:15:05 +00:00
Andrew M. Kuchling 420d4eb1f3 #1607951: Make mailbox.Maildir re-read the directories less frequently.
This is done by recording the current time -1sec, and not re-reading unless
the directory mod. times are >= the recorded time.
2009-05-02 19:17:28 +00:00
Gregory P. Smith 6e7bdde2c8 Convert test method names to PEP8 style. 2009-05-02 18:58:21 +00:00
Benjamin Peterson bf6c410b2e revert unrelated change 2009-05-02 17:35:39 +00:00
Benjamin Peterson 6282169142 remove py3k compat code 2009-05-02 17:33:01 +00:00
Benjamin Peterson d7e8e3444f don't let sys.argv be used in the tests 2009-05-02 16:24:37 +00:00
Michael Foord 829f6b8052 Adds an exit parameter to unittest.main(). If False main no longer
calls sys.exit.

Closes issue 3379.

Michael Foord
2009-05-02 11:43:06 +00:00
Antoine Pitrou 1fc0231a22 Issue #3002: `shutil.copyfile()` and `shutil.copytree()` now raise an
error when a named pipe is encountered, rather than blocking infinitely.
2009-05-01 20:55:35 +00:00
Gregory P. Smith 1d499265e0 Adds the ipaddr module to the standard library. Issue #3959.
Based off of subversion r69 from http://code.google.com/p/ipaddr-py/

This code is 2to3 safe, I'll merge it into py3k later this afternoon.
2009-05-01 19:59:52 +00:00
Walter Dörwald 6733bed57e Make test.test_support.EnvironmentVarGuard behave like a dictionary.
All changes are mirrored to the underlying os.environ dict, but rolled back
on exit from the with block.
2009-05-01 17:35:37 +00:00
Senthil Kumaran 4af40d2173 Fix for Issue1648102, based on the MSDN spec: If this parameter specifies the
"<local>" macro as the only entry, this function bypasses any host name that
does not contain a period.
2009-05-01 05:59:52 +00:00
Eric Smith 9139cc6a3b Issue #1588: Add complex.__format__. 2009-04-30 00:58:58 +00:00
Benjamin Peterson 2518d3c1c0 prevent ref cycles by removing bound method on close() 2009-04-30 00:23:11 +00:00
Benjamin Peterson 7c7250da45 make sure to close file 2009-04-30 00:06:33 +00:00
Benjamin Peterson a9b4d4777a make sure mode is removable while cleaning up test droppings 2009-04-29 22:44:15 +00:00
Benjamin Peterson 9c6fc5187f fix test_shutil on ZFS #5676 2009-04-29 22:43:35 +00:00
Mark Dickinson 61a0d05291 Backport some of the float formatting tests from py3k. 2009-04-29 21:57:15 +00:00
Mark Dickinson 92fcc9c991 Issue #5864: format(1234.5, '.4') gives misleading result
(Backport of r72109 from py3k.)
2009-04-29 20:41:00 +00:00
R. David Murray 0f457e5825 More aifc tests. 2009-04-29 20:15:18 +00:00
R. David Murray 971b1b100b Now that we've got a test_aifc, add a few tests. 2009-04-29 13:51:44 +00:00
R. David Murray 25b4add5b0 Fix issue 2245. aifc now skips any chunk type it doesn't actually
process instead of throwing errors for anything not in an explicit
skip list.  This is per this spec: http://www.cnpbagwell.com/aiff-c.txt.
Spec reference and test sound file provided by Santiago Peresón, fix
based on patch by Hiroaki Kawai.
2009-04-29 13:17:37 +00:00
Tarek Ziadé a1b91d944b Fixed #5874 : distutils.tests.test_config_cmd is not locale-sensitive anymore 2009-04-29 08:03:46 +00:00
Raymond Hettinger a016debad0 Update spec version number. 2009-04-27 21:12:27 +00:00
Antoine Pitrou f2651e193c Issue #5853: calling a function of the mimetypes module from several threads
at once could hit the recursion limit if the mimetypes database hadn't been
initialized before.
2009-04-27 20:50:20 +00:00
Vinay Sajip e34d6aa86f Issue #5854: Updated __all__ to include some missing names and remove some names which should not be exported. 2009-04-27 13:44:27 +00:00
Kurt B. Kaiser 94290d390e Right click 'go to file/line' not working if spaces
in path.  Bug 5559.
2009-04-26 23:22:11 +00:00
Walter Dörwald 4b965f6ab1 Use test.test_support.EnvironmentVarGuard where tests change environment vars. 2009-04-26 20:51:44 +00:00
Walter Dörwald 4c69da2879 Fix typo. 2009-04-26 19:11:43 +00:00
Georg Brandl d40fb70268 Update pydoc topics. 2009-04-26 09:57:29 +00:00
Georg Brandl 438192540d Move pydoc_topics module to its own subdirectory, so that no generated code is in Lib/. 2009-04-26 09:56:44 +00:00
Martin v. Löwis 99f277933e Issue #4971: Fix titlecase for characters that are their own
titlecase, but not their own uppercase.
2009-04-26 00:53:18 +00:00
Eric Smith 068f06568b Issue #5835, deprecate PyOS_ascii_formatd.
If anyone wants to clean up the documentation, feel free. It's my first documentation foray, and it's not that great.

Will port to py3k with a different strategy.
2009-04-25 21:40:15 +00:00
Georg Brandl 208b00d03f #5841: add deprecation py3k warning and notice in the docs for commands module. 2009-04-25 15:11:29 +00:00
Walter Dörwald 5d98ec76bb Issue #5828 (Invalid behavior of unicode.lower): Fixed bogus logic in
makeunicodedata.py and regenerated the Unicode database (This fixes
u'\u1d79'.lower() == '\x00').
2009-04-25 14:03:16 +00:00
Tarek Ziadé bcddf6777a #5810: Fixed Distutils test_build_scripts 2009-04-25 12:51:59 +00:00
Tarek Ziadé d567c38ef2 Issue #4951: Fixed failure in test_httpservers 2009-04-25 12:38:08 +00:00
Walter Dörwald a145317be9 Issue #5837: Certain sequences of calls to set() and unset() for
support.EnvironmentVarGuard objects restored the environment variables
incorrectly on __exit__.

Fix this by recording the initial value of each environment variable on the
first access in set() or unset().
2009-04-25 12:15:07 +00:00
Mark Dickinson 0a6501bf56 Fix typo in complex parsing code; expand tests. 2009-04-25 09:47:00 +00:00
Benjamin Peterson 5083dc552b fix a segfault when setting __class__ in __del__ #5283 2009-04-25 00:41:22 +00:00
Thomas Heller ec21ccde12 Issue 5041: ctypes unwilling to allow pickling wide character. 2009-04-24 20:00:41 +00:00
Mark Dickinson 0badeef93e Remove unnecessary double negative 2009-04-24 16:37:22 +00:00
Mark Dickinson 6ab635a4f4 Issue #5593: Use more robust test for double-rounding in test_fsum.
While we're at it, use new unittest.skipUnless decorator to
implement skipping for that test.
2009-04-24 16:34:14 +00:00
Mark Dickinson 4af8e745c4 Issue #5812: The two-argument form of the Fraction constructor
now accepts arbitrary Rational instances.
2009-04-24 13:56:07 +00:00
Mark Dickinson 95bc980d9e Issue #5816:
- simplify parsing and printing of complex numbers
 - make complex(repr(z)) round-tripping work for complex
   numbers involving nans, infs, or negative zeros
 - don't accept some of the stranger complex strings
   that were previously allowed---e.g., complex('1..1j')
2009-04-24 12:46:53 +00:00
Kurt B. Kaiser f13447f3f7 Produce correct version string to access the .chm
docs on Windows.  Patch 5783 gpolo.  Will port.
2009-04-23 02:36:01 +00:00
Mark Dickinson 8100bd8431 Issue #5812: make Fraction('1e-6') valid. Backport of r71806. 2009-04-22 18:15:25 +00:00
Eric Smith ebafbb705c Fixed issue 5782: formatting with commas didn't work if no specifier type code was given. 2009-04-22 16:20:47 +00:00
Nick Coghlan 5533ff6a2e Issue 5354: Change API for import_fresh_module() to better support test_warnings use case (also fixes some bugs in the original implementation) 2009-04-22 15:26:04 +00:00
Eric Smith aca19e6a74 Backport of some of the work in r71665 to trunk. This reworks much of
int, long, and float __format__(), and it keeps their implementation
in sync with py3k.

Also added PyOS_double_to_string. This is the "fallback" version
that's also available in trunk, and should be kept in sync with that
code. I'll add an issue to document PyOS_double_to_string in the C
API.

There are many internal cleanups. Externally visible changes include:

- Implement PEP 378, Format Specifier for Thousands Separator, for
  floats, ints, and longs.

- Issue #5515: 'n' formatting for ints, longs, and floats handles
  leading zero formatting poorly.

- Issue #5772: For float.__format__, don't add a trailing ".0" if
  we're using no type code and we have an exponent.
2009-04-22 13:29:05 +00:00
Vinay Sajip cbb5308723 Issue #5170: Fixed regression caused when fixing #5768. 2009-04-22 12:10:47 +00:00
R. David Murray 95fb46c977 Restore skips of posix and pty tests on Windows by calling the
test_support.import_module on the appropriate modules
before any other imports.
2009-04-21 13:06:04 +00:00
Senthil Kumaran 7c2867fcb1 Fix for the Issue918368 - urllib doesn't correct server returned urls 2009-04-21 03:24:19 +00:00
Mark Dickinson a7e734fcee Nit: integer division should use //, not / 2009-04-20 21:41:04 +00:00
Mark Dickinson 6736cf8d20 Issue #3166: Make long -> float (and int -> float) conversions
correctly rounded, using round-half-to-even.  This ensures that the
value of float(n) doesn't depend on whether we're using 15-bit digits
or 30-bit digits for Python longs.
2009-04-20 21:13:33 +00:00
Tarek Ziadé 2c4e741447 making BuildWinInstTestCase silent in case bdist_wininst is not run under win32 2009-04-20 10:33:47 +00:00
Tarek Ziadé 92d77b7eac #5795 sysconfig._config_vars was shadowed in tearDown 2009-04-20 07:53:55 +00:00
Mark Dickinson 9be2697fb6 Automatic conversion of floats to integers for struct.pack integer codes
is deprecated.  Use an explicit int() instead.
2009-04-19 17:10:47 +00:00
Benjamin Peterson accb3d0014 move test to a more appropiate one 2009-04-18 21:03:10 +00:00
Benjamin Peterson d4d400cb8a try to initalize all builtin types with PyType_Ready to avoid problems like #5787 2009-04-18 20:12:47 +00:00
Benjamin Peterson baba195eb2 fix a few nits in unittest.py #5771 2009-04-18 19:26:19 +00:00
Mark Dickinson 1bdf7e9cab Issue #1869: Fix a couple of minor round() issues. 2009-04-18 14:59:42 +00:00
Tarek Ziadé 783f493173 DistutilsSetupError was not raised when one single warning occured 2009-04-17 14:29:56 +00:00
Vinay Sajip 74f045088d Issue #5768: Change to Unicode output logic and test case for same. 2009-04-16 19:07:37 +00:00
Benjamin Peterson 99d36f1563 call __float__ on str subclasses #5759
tests by R. David Murray
2009-04-15 21:26:36 +00:00
Tarek Ziadé eb6e0f583d pep8-fied 2009-04-13 20:14:54 +00:00
Tarek Ziadé 2fdd0d5ab7 improved test coverage for distutils.cmd 2009-04-13 20:03:44 +00:00
Tarek Ziadé 710fbc32ae deactivate test_search_cpp under win32 2009-04-13 12:42:26 +00:00
Georg Brandl 73709e62ff #5741 followup: should also allow %%(blah)s. 2009-04-13 12:36:24 +00:00
Tarek Ziadé 156c31a7be Fixed #5607: Distutils test_get_platform was failing fo Mac OS X fat binaries. 2009-04-13 12:34:01 +00:00
R. David Murray dcad046d39 Adjust test_asyncore to account for intentional asyncore behavior change
introduced by r70934 that was causing a test failure when run under -O.
2009-04-13 01:06:46 +00:00
Georg Brandl aa48157d3d #5719: add short usage example to optparse docstring. 2009-04-12 20:30:53 +00:00
Benjamin Peterson 457fefc3f8 remove useless import 2009-04-12 20:24:56 +00:00
Georg Brandl 21cf5ee6fd #5741: dont disallow double percent signs in SafeConfigParser.set() keys. 2009-04-12 17:24:11 +00:00
Tarek Ziadé 3295eed64b removed string usage and added a test for _clean 2009-04-12 17:02:08 +00:00
Tarek Ziadé e643bed198 added a test for finalize_options 2009-04-12 16:45:32 +00:00
Tarek Ziadé f6f4b3084c added a simple test for search_cpp 2009-04-12 16:31:24 +00:00
Tarek Ziadé 7bea344d35 pep8-fied the module before adding tests 2009-04-12 15:03:50 +00:00
Tarek Ziadé aa48798f1e removed the print statements and added a test 2009-04-12 14:53:51 +00:00
R. David Murray 5331d4b4de Make test_asyncore tests match code changes introduced by the
fix to Issue1161031, refactoring the test to simplify it in
the process.
2009-04-11 17:52:56 +00:00
Tarek Ziadé c2936b786a testing a full check case 2009-04-11 15:14:17 +00:00
Tarek Ziadé 942825f7de #5732: added the check command into Distutils 2009-04-11 14:55:07 +00:00
Nick Coghlan cd2e7042ae Issue 5354: Provide a standardised testing mechanism for doing fresh imports of modules, including the ability to block extension modules in order to test the pure Python fallbacks 2009-04-11 13:31:31 +00:00
Chris Withers b524825788 remove unpleasant exec 2009-04-11 11:22:19 +00:00
Georg Brandl e019706862 #5698: Fix casing of !DOCTYPE to conform to W3C specs. 2009-04-10 08:20:23 +00:00
R. David Murray 0374a82f75 Issue #2170: refactored xml.dom.minidom.normalize, increasing both
its clarity and its speed.
2009-04-09 21:54:50 +00:00
Tarek Ziadé ad95826c33 Fixed #5731: Distutils bdist_wininst no longer worked on non-Windows platforms 2009-04-09 21:36:44 +00:00
Collin Winter f8089c7789 Issue 5665: add more pickling tests.
- Add tests for the module-level load() and dump() functions.
- Add tests for cPickle's internal data structures, stressing workloads
with many gets/puts.
- Add tests for the Pickler and Unpickler classes, in particular the
memo attribute.
- test_xpickle is extended to test backwards compatibility with Python
2.4, 2.5 and 2.6 by round-tripping pickled objects through a worker
process. This is guarded with a regrtest -u xpickle resource.
2009-04-09 16:46:46 +00:00
Raymond Hettinger 1355a3dbf6 Minor factoring. 2009-04-08 08:26:55 +00:00
Raymond Hettinger a5cd6375c0 Add docstrings. 2009-04-08 05:39:38 +00:00
Jack Diederich 7f9bb9142e - Make timing assertions very generous (a la test_timeout.py)
- Break the gc cycle in negotiation tests
- test the different guarantees of read_lazy and read_very_lazy
2009-04-07 23:56:57 +00:00
Jack Diederich 3b2312ee5c eliminate more race conditions in telnetlib tests 2009-04-07 20:22:59 +00:00
Vinay Sajip 14bf0a0a37 Issue #5695: Minor tweak to improve the code as suggested by Brett Cannon and as implemented in the Py3K branch. 2009-04-07 17:18:24 +00:00
Benjamin Peterson dda7b1990b revert unrelated change to test_telnetlib 2009-04-07 16:03:04 +00:00
Benjamin Peterson a1b821cf60 fix since difference formating of SyntaxErrors 2009-04-07 15:52:05 +00:00
Benjamin Peterson 52b9620c19 fix syntax tests after formatting change 2009-04-07 15:15:04 +00:00
Benjamin Peterson a27e6e3d58 add create_connection to __all__ #5711 2009-04-06 21:53:33 +00:00
Gregory P. Smith 923ba361d8 - Issue #2254: Fix CGIHTTPServer information disclosure. Relative paths are
now collapsed within the url properly before looking in cgi_directories.
2009-04-06 06:33:26 +00:00
Jack Diederich 183028ed79 test the telnetlib.Telnet interface more thoroughly 2009-04-06 02:08:44 +00:00
Gregory P. Smith 6d30793cf2 Fixes issue5705: os.setuid() and friends did not accept the same range of
values that pwd.getpwnam() returns.
2009-04-05 23:43:58 +00:00
Tarek Ziadé fdda68e030 pep8-fied method names 2009-04-05 23:03:10 +00:00
Tarek Ziadé 64408fb4c5 Fixed #5095: msi missing from Distutils bdist formats 2009-04-05 22:51:09 +00:00
Tarek Ziadé d9e221d232 added a simplest test to distutils.spawn._nt_quote_args 2009-04-05 22:04:38 +00:00
Tarek Ziadé faa6b121fb Fixed #1491431: distutils.filelist.glob_to_re was broken for some edge cases (detailed in the test 2009-04-05 21:44:08 +00:00
Matthias Klose a5d58c831f - Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for
new arguments introduced in 2.5.
2009-04-05 21:00:48 +00:00
Michael Foord f2dfef1637 Adding assertIs and assertIsNot methods to unittest.TestCase
Issue #2578
2009-04-05 19:19:28 +00:00
Georg Brandl 7ab5eb91b7 #602893: add indicator for current line in cgitb that doesnt rely on styling alone. 2009-04-05 18:34:58 +00:00
Tarek Ziadé 453d953f3e Fixed 5694: removed spurious test output in Distutils 2009-04-05 18:31:24 +00:00
Georg Brandl d4315191ca #5432: make plistlib docstring a raw string, since it contains examples with backslash escapes. 2009-04-05 15:14:29 +00:00
Georg Brandl 3f0ef20269 #5471: fix expanduser() for $HOME set to "/". 2009-04-05 14:48:49 +00:00
Georg Brandl dc4a77159b #1326077: fix traceback formatting of SyntaxErrors. This fixes two differences with formatting coming from Python: a) the reproduction of location details in the error message if no line text is given, b) the prefixing of the last line by one space. 2009-04-05 14:24:52 +00:00
Vinay Sajip 1e566cec6f Issue #5695: Moved logging.captureWarnings() call inside with statement in WarningsTest.test_warnings. 2009-04-05 11:06:24 +00:00
Georg Brandl 50ba6e1b50 #1726172: dont raise an unexpected IndexError if a voidresp() call has an empty response. 2009-04-05 10:48:47 +00:00
Michael Foord 37d89a2955 Change the way unittest.TestSuite use their tests to always access them through iteration. Non behavior changing, this allows you to create custom subclasses that override __iter__.
Issue #5693
2009-04-05 01:15:01 +00:00
Benjamin Peterson 1d22d00e97 compare types with is 2009-04-05 01:04:38 +00:00
Hirokazu Yamamoto 772033f08c No behavior change. 2009-04-04 17:20:05 +00:00
Raymond Hettinger e3bc5577e8 Replace the localized min/max calls with normal if/else 2009-04-04 08:46:58 +00:00
Kurt B. Kaiser 013d6cc0df Allow multiple IDLE GUI/subprocess pairs to exist
simultaneously. Thanks to David Scherer for suggesting
the use of an ephemeral port for the GUI.
Patch 1529142 Weeble.
2009-04-04 07:03:48 +00:00
Raymond Hettinger 6ecb1a3145 Localize the function lookup in timeit. 2009-04-03 02:43:54 +00:00
Raymond Hettinger 756ab67a98 Have namedtuple's field renamer assign names that
are consistent with the corresponding tuple index.
2009-04-02 22:25:40 +00:00
Antoine Pitrou 789be0c0a0 Issue #2396: backport the memoryview object. 2009-04-02 21:18:34 +00:00
Mark Dickinson 48e3fd240f sys.long_info attributes should be ints, not longs 2009-04-02 18:39:37 +00:00
Georg Brandl dd98e04c57 Actually the displayhook should print the repr. 2009-04-02 17:43:07 +00:00
R. David Murray 52720c5455 Add missing iteritems() call to the for loop in mailbox.MH.get_message().
Fixes issue2625.
2009-04-02 14:05:35 +00:00
Michael Foord e2942d073d Store the functions in the _type_equality_funcs as wrapped objects that are deep copyable.
This allows for the deep copying of TestCase instances.

Issue 5660
2009-04-02 05:51:54 +00:00
Jesse Noller 7152f6d915 Add custom initializer argument to multiprocess.Manager*, courtesy of lekma 2009-04-02 05:17:26 +00:00
Michael Foord 345b2fe21e Better exception messages for unittest assert methods.
- unittest.assertNotEqual() now uses the inequality operator (!=) instead
  of the equality operator.

- Default assertTrue and assertFalse messages are now useful.

- TestCase has a longMessage attribute. This defaults to False, but if set to True
  useful error messages are shown in addition to explicit messages passed to assert methods.

Issue #5663
2009-04-02 03:20:38 +00:00
Senthil Kumaran c730a6a123 Fixing the issue4860. Escaping embedded '"' character in js_output() method of Morsel. 2009-04-02 03:00:34 +00:00
Kurt B. Kaiser 4724f40bcb Remove port spec from run.py and fix bug where
subprocess fails to extract port from command line
when warnings are present.
2009-04-02 02:44:54 +00:00
Georg Brandl 569fc96f99 Fix test_doctest, missed two assignments to curframe. 2009-04-02 02:00:01 +00:00
Benjamin Peterson 3633c4f7d2 handle SEEK_ constants in test_io 2009-04-02 01:03:17 +00:00
Georg Brandl e361bcb43f Cache the f_locals dict of the current frame, since every access to frame.f_locals overrides its contents with the real locals which undoes modifications made by the debugging user. 2009-04-01 23:32:17 +00:00
Benjamin Peterson 71095ae5ab remove double underscores 2009-04-01 23:15:49 +00:00
Georg Brandl 58b8b95cdb In Pdb, stop assigning values to __builtin__._ which interferes with the one commonly installed by gettext. 2009-04-01 21:54:21 +00:00
R. David Murray 3864459196 Add tests checking the CSV module's ability to handle
embedded newlines in quoted field values.
2009-04-01 21:26:18 +00:00
Benjamin Peterson cafc225f54 add seek constants to __all__ 2009-04-01 21:12:54 +00:00
Georg Brandl 00b6590821 Revert accidental checkin. 2009-04-01 21:06:30 +00:00
Georg Brandl 5942b91759 Add NEWS item. 2009-04-01 21:05:44 +00:00
Georg Brandl 88ed8f2c50 #4572: add SEEK_* values as constants in io.py. 2009-04-01 21:00:55 +00:00
Senthil Kumaran 20d114cad2 Fix for issue5040. Adding test for Content-Length 2009-04-01 20:26:33 +00:00
Jack Diederich 2ecd3c36b5 bounds check arguments to mmap.move(). All of them. Really.
fixes crasher on OS X 10.5
2009-04-01 20:26:13 +00:00
Brett Cannon ce3d221447 test_warnings ironically had a single test that was not protecting the warnings
filter and was resetting it.
2009-04-01 20:25:48 +00:00
Brett Cannon 2da4d628a5 test_logging was blindly clearing the warnings filter. This caused
PendingDeprecationWarnings to be spewed all over by unittest.failIf*(). Fix
moves over to using warnings.catch_warning to protect the warnings filter.
2009-04-01 19:57:10 +00:00
Raymond Hettinger 66c4a6b51c Issue #5647: MutableSet.__iand__() no longer mutates self during iteration. 2009-04-01 18:50:56 +00:00
Brett Cannon 15ba4dae5a _warnings was importing itself to get an attribute. That's bad if warnings gets
called in a thread that was spawned by an import itself.

Last part to close #1665206.
2009-04-01 18:03:59 +00:00
Georg Brandl 3ade7612d8 #5655: fix docstring oversight. 2009-04-01 17:46:01 +00:00
Brett Cannon ad078a0d7a The cgitb module had imports in its functions. This can cause deadlock with the
import lock if called from within a thread that was triggered by an import.

Partially fixes issue #1665206.
2009-04-01 16:00:34 +00:00
Georg Brandl 61fce3877c Fix test_xmlrpc and make the CGI handler work with no CONTENT_LENGTH. 2009-04-01 15:23:43 +00:00
Georg Brandl 63959bb973 #5631: add upload to list of possible commands, which is presented in --help-commands. 2009-04-01 04:32:39 +00:00
Georg Brandl e92d4b6f57 The SimpleXMLRPCServer's CGI handler now runs like a pony. 2009-04-01 04:21:14 +00:00
Jesse Noller 02cb0eb231 Fix multiprocessing.event to match the new threading.Event API 2009-04-01 03:45:50 +00:00
R. David Murray a83da3507f Fix issue 2522. locale.format now checks that it is passed
exactly one pattern, which avoids mysterious errors where it
had seemed to fail to do localization.
2009-04-01 03:21:43 +00:00
Josiah Carlson bb94d43dcd Fix for failing asyncore tests. 2009-04-01 01:28:11 +00:00
Georg Brandl d8fb6ac9da Issue #5635: Fix running test_sys with tracing enabled. 2009-04-01 00:04:33 +00:00
Jack Diederich d60c29ed8b #5228: add pickle support to functools.partial 2009-03-31 23:46:48 +00:00
R. David Murray 840ac926c5 Fix Windows test skip error revealed by buildbot. Also a comment spelling
correction in a previously fixed test.
2009-03-31 23:45:39 +00:00
Tarek Ziadé 3bb5a9642b fixed the test for win32 CompileError 2009-03-31 22:47:01 +00:00
Tarek Ziadé 2bdefb3eee catching msvc9compiler error as well 2009-03-31 22:44:10 +00:00
Tarek Ziadé 9e47ce49a0 #5583 Added optional Extensions in Distutils 2009-03-31 22:27:23 +00:00
Georg Brandl 0c7b2c9c19 #1651995: fix _convert_ref for non-ASCII characters. 2009-03-31 22:11:53 +00:00
Josiah Carlson aba27dd6d9 Made handle_expt_event() be called last, so that we don't accidentally read
after closing the socket.
2009-03-31 21:49:36 +00:00
Benjamin Peterson d906ea62c8 fix Thread.ident when it is the main thread or a dummy thread #5632 2009-03-31 21:34:42 +00:00
Benjamin Peterson bd9dd31abd take the usual lock precautions around _active_limbo_lock 2009-03-31 21:06:30 +00:00
Tarek Ziadé 1a1158f955 making sdist and config test silents 2009-03-31 20:56:11 +00:00
Tarek Ziadé 899dd1221d added tests to the install_headers command 2009-03-31 20:55:21 +00:00
Tarek Ziadé a961a0444d added test to the install_data command 2009-03-31 20:54:38 +00:00
Tarek Ziadé e899b711df more tests for the upload command 2009-03-31 20:53:55 +00:00
Tarek Ziadé ca2b8d283a more tests for the register command 2009-03-31 20:53:13 +00:00
Tarek Ziadé 023862890f added tests for the clean command 2009-03-31 20:50:59 +00:00
Tarek Ziadé c7cd138bc2 using log.warn for sys.stderr 2009-03-31 20:48:31 +00:00
Georg Brandl ef660e8e50 #1674032: return value of flag from Event.wait(). OKed by Guido. 2009-03-31 20:41:08 +00:00
Hirokazu Yamamoto 1d7d5325be Issue #5387: Fixed mmap.move crash by integer overflow. (take2) 2009-03-31 20:14:04 +00:00
Gregory P. Smith 65ff00559a Issue an actual PendingDeprecationWarning for the TestCase.fail* methods.
Document the deprecation.
2009-03-31 19:59:14 +00:00
R. David Murray 612f1d5f48 Remove the regrtest check that turns any ImportError into a skipped test.
Hopefully all modules whose imports legitimately result in a skipped
test have been properly wrapped by the previous commits.
2009-03-31 19:49:15 +00:00
R. David Murray bdeacba51b Improve test_support.import_module docstring, remove
deprecated flag from get_attribute since it isn't likely
to do anything useful.
2009-03-31 19:33:15 +00:00
Josiah Carlson df90b02415 This resolves issue 1161031. Tests pass. 2009-03-31 19:32:34 +00:00
R. David Murray 73fba6915a Delete out-of-date and little-known README from the test
directory by consensus of devs at pycon sprint.
2009-03-31 19:31:17 +00:00
Georg Brandl c5d8c63345 #5190: export make_option in __all__. 2009-03-31 19:12:17 +00:00
Gregory P. Smith 7558d57ad2 Rename the actual method definitions to the official assertFoo names.
Adds unittests to make sure the old fail* names continue to work now
and adds a comment that they are pending deprecation.

Also adds a test to confirm that the plural Equals method variants
continue to exist even though we're unlikely to deprecate those.

http://bugs.python.org/issue2578
2009-03-31 19:03:28 +00:00
R. David Murray 597ebab744 A few more test skips via import_module, and change import_module to
return the error message produced by importlib, so that if an import
in the package whose import is being wrapped is what failed the skip
message will contain the name of that module instead of the name of the
wrapped module.  Also fixed formatting of some previous comments.
2009-03-31 18:32:17 +00:00
Raymond Hettinger 3476d1279f Per the language summit, the optional fastpath imports should use from-import-star. 2009-03-31 17:47:06 +00:00
Gregory P. Smith 2839985c7e The unittest.TestCase.assertEqual() now displays the differences in lists,
tuples, dicts and sets on failure.

Many new handy type and comparison specific assert* methods have been added
that fail with error messages actually useful for debugging.  Contributed in
by Google and completed with help from mfoord and GvR at PyCon 2009 sprints.

Discussion lives in http://bugs.python.org/issue2578.
2009-03-31 16:54:10 +00:00
Jeremy Hylton 88f1c04215 Global statements from one function leaked into parallel functions.
Re http://bugs.python.org/issue4315

The symbol table used the same name dictionaries to recursively
analyze each of its child blocks, even though the dictionaries are
modified during analysis.  The fix is to create new temporary
dictionaries via the analyze_child_block().  The only information that
needs to propagate back up is the names of the free variables.

Add more comments and break out a helper function.  This code doesn't
get any easier to understand when you only look at it once a year.
2009-03-31 13:48:15 +00:00
Jeremy Hylton 1c157ea984 Add is_declared_global() which distinguishes between implicit and
explicit global variables.
2009-03-31 13:17:03 +00:00
Hirokazu Yamamoto 9d2ee5ded2 Issue #5387: Fixed mmap.move crash by integer overflow. 2009-03-31 13:13:05 +00:00
Jesse Noller b2898e0acb add JoinableQueue to __all__ 2009-03-31 03:31:16 +00:00
Jesse Noller 82eb5902ce merge in patch from tim golden to fix contextmanager support for mp.Lock() 2009-03-30 23:29:31 +00:00
R. David Murray d7bf8a5478 Actually suppress warnings in test_at_least_import_untested_modules
inside the catch_warnings context manager.
2009-03-30 23:10:37 +00:00
Ronald Oussoren e0154ed7ff Fix issue #4865: add /Library/Python/2.7/site-packages to
sys.path on OSX, to make it easier to share (some) installed
packages between the system install and a user install.
2009-03-30 23:10:35 +00:00
R. David Murray 3db8a3432b Change more tests to use import_module for the modules that
should cause tests to be skipped.  Also rename import_function
to the more descriptive get_attribute and add a docstring.
2009-03-30 23:05:48 +00:00
Barry Warsaw dbf95a3643 A fix for issue 1974, inspired by the patch from Andi Albrecht (aalbrecht),
though with some changes by me.  This patch should not be back ported or
forward ported.  It's a bit too risky for 2.6 and 3.x does things fairly
differently.
2009-03-30 22:42:17 +00:00
Jesse Noller 019ce773cd finalize the queue prior to shutdown 2009-03-30 21:53:29 +00:00
Senthil Kumaran 5e95e763e1 Fix for bugs: Issue4675 and Issue4962. 2009-03-30 21:51:50 +00:00
R. David Murray e7c9e092b3 Remove references to test_socket_ssl which was deleted in trunk
in r64392 and py3k in r59038.
2009-03-30 20:04:06 +00:00
R. David Murray 59beec326a Add import_function method to test.test_support, and modify a number of
tests that expect to be skipped if imports fail or functions don't
exist to use import_function and import_module.  The ultimate goal is
to change regrtest to not skip automatically on ImportError.  Checking
in now to make sure the buldbots don't show any errors on platforms
I can't direct test on.
2009-03-30 19:04:00 +00:00
Kurt B. Kaiser ce46511957 Tk 8.5 Text widget requires 'wordprocessor' tabstyle attr to handle mixed space/tab properly. Issue 5120, patch by Guilherme Polo. 2009-03-30 16:22:00 +00:00
Jesse Noller 459a648166 Issue 5177: use socket.SO_REUSEADDR on multiprocessing SocketManager sockets 2009-03-30 15:50:42 +00:00
R. David Murray 5cb104d1b9 Revert incorrect change. 2009-03-30 15:30:34 +00:00
Benjamin Peterson 68ffe3ec67 don't rely on the order dict repr #5605 2009-03-30 15:15:38 +00:00
R. David Murray ad74dfe8ff Convert import try/except to use test_support.import_module(). 2009-03-30 15:14:01 +00:00
Benjamin Peterson 3c87e2289d add missing import 2009-03-30 14:42:23 +00:00
Benjamin Peterson 33cd7ef867 fix import 2009-03-30 02:14:21 +00:00
Bob Ippolito 76a982a027 Issue 5381: fix regression in pure python code path, Issue 5584: fix a decoder bug for unicode float literals outside of a container 2009-03-29 22:33:58 +00:00
Benjamin Peterson 8e1a338129 add missing import 2009-03-29 22:27:26 +00:00
Benjamin Peterson 83db7652ca thanks to guido's bytecode verifier, this is fixed 2009-03-29 21:31:05 +00:00
Benjamin Peterson d2c184605e this has been fixed since 2.6 (I love removing these) 2009-03-29 21:22:35 +00:00
Raymond Hettinger b006fcc30c Make life easier for non-CPython implementations. 2009-03-29 18:51:11 +00:00
Guilherme Polo 310916212e Typo fix. 2009-03-29 10:19:05 +00:00
Collin Winter a199f01986 Add the ability to control the random seed used by regrtest.py -r.
This adds a --randseed option, and makes regrtest.py -r indicate what random seed it's using so that that value can later be fed back to --randseed. This option is useful for tracking down test order-related issues found by make buildbottest, for example.
2009-03-29 03:44:19 +00:00
Georg Brandl 5adab304e3 Fix typo. 2009-03-28 00:48:48 +00:00
Benjamin Peterson 7fa9459baf fix another name 2009-03-26 21:44:43 +00:00
Benjamin Peterson 04232973b7 update email tests to use SkipTest 2009-03-26 21:40:29 +00:00
Benjamin Peterson effa1dc709 ** is required here 2009-03-26 21:30:54 +00:00
Benjamin Peterson bf4464a38f add missing import 2009-03-26 21:30:10 +00:00
Benjamin Peterson a9b5be0c05 must pass argument to get expected behavior ;) 2009-03-26 21:11:16 +00:00
Benjamin Peterson bec087f29d fix incorrect auto-translation of TestSkipped -> unittest.SkipTest 2009-03-26 21:10:30 +00:00
Benjamin Peterson ad57d97596 fix naming 2009-03-26 20:49:40 +00:00
Benjamin Peterson 888a39b54c remove test_support.TestSkipped and just use unittest.SkipTest 2009-03-26 20:48:25 +00:00
Benjamin Peterson 21f6aac633 apply the second part of #4242's patch; classify all the implementation details in test_descr 2009-03-26 20:17:27 +00:00
Benjamin Peterson 47d9738b0f rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571 2009-03-26 20:05:50 +00:00
Benjamin Peterson c3141a6e96 add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
2009-03-26 19:58:18 +00:00
Benjamin Peterson 0ad9b7727d add support for PyPy 2009-03-26 19:09:21 +00:00
Benjamin Peterson 94e4e2a7e5 roll old test in with new one 2009-03-26 18:58:30 +00:00
Benjamin Peterson b457b89323 more and more implementations now support sys.subversion 2009-03-26 18:55:48 +00:00
Benjamin Peterson f521b8c6d2 add much better tests for python version information parsing 2009-03-26 18:35:37 +00:00
Benjamin Peterson c9301355d8 remove uneeded function 2009-03-26 16:32:23 +00:00
Raymond Hettinger 2dc90fdfaf Separate initialization from clearing. 2009-03-25 22:41:32 +00:00
Benjamin Peterson 2f6f7436aa this can be slightly less ugly 2009-03-25 21:42:51 +00:00
Benjamin Peterson a8adceb431 add shorthands for expected failures and unexpected success 2009-03-25 21:24:04 +00:00
Marc-André Lemburg a519cfc953 Remove the sys.version_info shortcut, since they cause the APIs
to return different information than the _sys_version() output
used in previous Python versions.

This also fixes issue5561: platform.python_version_tuple returns tuple of ints, should be strings

Added more tests for the various platform functions.
2009-03-25 19:44:58 +00:00
Benjamin Peterson d0cdb2ddf2 another style nit 2009-03-24 23:07:07 +00:00
Benjamin Peterson a473f00cac fix newline issue in test summary 2009-03-24 22:56:32 +00:00
Benjamin Peterson 2bf74fd0ac this is better written using assertRaises 2009-03-24 03:24:56 +00:00
Benjamin Peterson 037154865e fix typo 2009-03-24 01:11:37 +00:00
Benjamin Peterson c750d4d761 add new skipping things to __all__ 2009-03-24 00:39:24 +00:00
Benjamin Peterson 4e4de33ca9 update docstring 2009-03-24 00:37:12 +00:00
Benjamin Peterson 3e0aa49d3f remove special metadata 2009-03-24 00:36:16 +00:00
Benjamin Peterson a7d441de68 some cleanup and modernization 2009-03-24 00:35:20 +00:00
Benjamin Peterson bca248e9a5 update from CVS 2009-03-23 23:19:03 +00:00
Benjamin Peterson cb2b0e45d4 comply with the evilJavaNamingScheme for attribute names
It seems my love of PEP 8 overrode the need for consistentcy
2009-03-23 22:29:45 +00:00
Benjamin Peterson 692428e77f implement test skipping and expected failures
patch by myself #1034053
2009-03-23 21:50:21 +00:00
Benjamin Peterson 797eaf305a complain when there's no last exception 2009-03-23 21:25:15 +00:00
Benjamin Peterson 3e6c335ae0 revert r70552; wrong fix 2009-03-23 21:23:30 +00:00
Benjamin Peterson 85e1478ca4 fix very old names for exception terms #5543 2009-03-23 20:47:59 +00:00
Antoine Pitrou f8387af262 Issue #4688: Add a heuristic so that tuples and dicts containing only
untrackable objects are not tracked by the garbage collector. This can
reduce the size of collections and therefore the garbage collection overhead
on long-running programs, depending on their particular use of datatypes.

(trivia: this makes the "binary_trees" benchmark from the Computer Language
Shootout 40% faster)
2009-03-23 18:41:45 +00:00
Raymond Hettinger e5b78563b6 Make imported name private and wrap long-line. 2009-03-23 18:26:59 +00:00
Raymond Hettinger 906f95e80b Move initialization of root link to __init__. 2009-03-23 04:42:18 +00:00
Raymond Hettinger f1e2df9780 Add more comments. Improve variable names.
Make links clearer by using a Link object
instead of a list.  Use proxy links to avoid
circular references.
2009-03-23 00:08:09 +00:00
Benjamin Peterson 704dc269e3 AttributeError can be thrown during recursion errors 2009-03-22 22:24:58 +00:00
Lars Gustäbel 2020a59563 Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop
forever on incomplete input. That caused tarfile.open() to hang when used
with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or
partial bzip2 compressed data.
2009-03-22 20:09:33 +00:00
Benjamin Peterson b364bfe2f4 close the file even if an exception occurs #5536 2009-03-22 17:45:11 +00:00
Mark Dickinson efc82f7e8e Issue #4258: Use 30-bit digits for Python longs, on 64-bit platforms.
Backport of r70459.
2009-03-20 15:51:55 +00:00
Raymond Hettinger c8e81ef508 Fix typo 2009-03-19 23:22:25 +00:00
Raymond Hettinger e980d2d44b * Add implementation notes.
* Re-order methods so that those touching the underlying data
  structure come first and the derived methods come last.
2009-03-19 23:12:41 +00:00
Raymond Hettinger 2412299be9 * Add clearer comment to initialization code.
* Add optional argument to popitem() -- modeled
  after Anthon van der Neut's C version.
* Fix method markup in docs.
2009-03-19 19:59:58 +00:00
Raymond Hettinger 91852ca673 Issue 5381: Add object_pairs_hook to the json module. 2009-03-19 19:19:03 +00:00
Raymond Hettinger 2124599eaa Improve implementation with better underlying data structure
for O(1) deletions.  Big-Oh performance now the same as regular
dictionaries.  Uses a doubly-linked list instead of a list/seq
to track insertion order.
2009-03-19 15:21:10 +00:00
Benjamin Peterson fcfa7ead4f close files after comparing them 2009-03-19 03:04:31 +00:00
Raymond Hettinger a61ae6922f Use mixin methods where possible. (2.7 only -- these don't all exist in 3.0) 2009-03-18 22:13:20 +00:00
Benjamin Peterson 6ffe852f90 fix strange errors when setting attributes on tracebacks #4034 2009-03-18 20:52:15 +00:00
Antoine Pitrou 7c33bd5ecb Attempt to fix Solaris buildbot failure on test_locale 2009-03-18 17:10:04 +00:00
Mark Dickinson b14514a153 Fix bug in _insert_thousands_sep: too much zero padding could be
added for 'n' formats with non-repeating thousands-separator.
2009-03-18 08:22:51 +00:00
Bob Ippolito d914e3f861 merge json library with simplejson 2.0.9 (issue 4136) 2009-03-17 23:19:00 +00:00
Mark Dickinson 277859d591 Issue #2110: Add support for thousands separator and 'n' format specifier
to Decimal __format__ method.
2009-03-17 23:03:46 +00:00
Mark Dickinson b065e52bc2 Fix bug in Decimal __format__ method that swapped left and right
alignment.
2009-03-17 18:01:03 +00:00
Hirokazu Yamamoto bb7467f6e3 Added skip for old MSVC. 2009-03-15 22:43:14 +00:00
Georg Brandl fc9ea97a18 Move the previously local import of threading to module level.
This is cleaner and avoids lockups in obscure cases where a Queue
is instantiated while the import lock is already held by another thread.

OKed by Tim Peters.
2009-03-15 22:11:07 +00:00
Eric Smith 2ace4cf813 Unicode format tests weren't actually testing unicode. This was probably due to the original backport from py3k. 2009-03-14 14:37:38 +00:00
Eric Smith 6f42edb682 Issue 5237, Allow auto-numbered replacement fields in str.format() strings.
For simple uses for str.format(), this makes the typing easier. Hopfully this
will help in the adoption of str.format().

For example:
'The {} is {}'.format('sky', 'blue')

You can mix and matcth auto-numbering and named replacement fields:
'The {} is {color}'.format('sky', color='blue')

But you can't mix and match auto-numbering and specified numbering:
'The {0} is {}'.format('sky', 'blue')
ValueError: cannot switch from manual field specification to automatic field numbering

Will port to 3.1.
2009-03-14 11:57:26 +00:00
Antoine Pitrou feeafff052 Issue #1222: locale.format() bug when the thousands separator is a space character. 2009-03-14 00:07:21 +00:00
Tarek Ziadé 61585c260c Issue #5472: Fixed distutils.test_util tear down 2009-03-11 12:48:04 +00:00
Brett Cannon 6c4cff0f32 Require implementations for warnings.showwarning() support the 'line' argument.
Was a DeprecationWarning for not supporting it since Python 2.6.

Closes issue #3652.
2009-03-11 04:51:06 +00:00
Raymond Hettinger 56411aac79 For collections.deque() objects, expose the maxlen parameter as a read-only attribute. 2009-03-10 12:50:59 +00:00
Raymond Hettinger bac769bb5e Small optimization for corner case where maxlen==0. 2009-03-10 09:31:48 +00:00
Raymond Hettinger daeceb2de8 Add a version tag to the decimal module. 2009-03-10 04:49:21 +00:00
Guilherme Polo 15d57653f1 Fixed issue #2638: Show a window constructed with tkSimpleDialog.Dialog only
after it is has been populated and properly configured in order to prevent
window flashing.
2009-03-07 02:14:38 +00:00
Guilherme Polo 6d6c1fd04e Fixed issue #5193: Guarantee that Tkinter.Text.search returns a string. 2009-03-07 01:19:12 +00:00
Tarek Ziadé 943b24e7e4 Issue #5394: removed > 2.3 syntax from distutils.msvc9compiler 2009-03-07 00:32:45 +00:00
Hirokazu Yamamoto 09033068f1 mmap.resize for anonymous map is not working yet, so changed to real file mapping... 2009-03-05 14:52:44 +00:00
Hirokazu Yamamoto 264fc12fbf Issue #5385: Fixed mmap crash after resize failure on windows.
Now uses NULL instead of INVALID_HANDLE_VALUE as invalid map handle
because CreateFileMapping returns NULL when error occurs.
2009-03-05 14:21:12 +00:00
Ronald Oussoren a97063a108 Fixes issues 3883 and 5194 2009-03-04 21:35:05 +00:00
Brett Cannon 417937733f Fix some more bugs caused by the backport from 3.x for importlib.
Do a more exact copy of the final 3.x code to resolve bugs and add
appropriate tests.
2009-03-04 01:00:53 +00:00
Raymond Hettinger 131af6505a Backport 70140, 70141, 70143, and 70144.
Adds tests, switches from list to deque, fixes __reduce__
which was unnecessarily copying __keys.
2009-03-03 22:59:25 +00:00
Hirokazu Yamamoto eacbbdfb73 Issue #5179: Fixed subprocess handle leak on failure on windows. 2009-03-03 22:18:14 +00:00
Raymond Hettinger 0b15541ae2 Minor simplification. 2009-03-03 21:13:51 +00:00