mirror of
https://github.com/python/cpython.git
synced 2025-07-08 03:45:36 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r58221 | georg.brandl | 2007-09-20 10:57:59 -0700 (Thu, 20 Sep 2007) | 2 lines Patch #1181: add os.environ.clear() method. ........ r58225 | sean.reifschneider | 2007-09-20 23:33:28 -0700 (Thu, 20 Sep 2007) | 3 lines Issue1704287: "make install" fails unless you do "make" first. Make oldsharedmods and sharedmods in "libinstall". ........ r58232 | guido.van.rossum | 2007-09-22 13:18:03 -0700 (Sat, 22 Sep 2007) | 4 lines Patch # 188 by Philip Jenvey. Make tell() mark CRLF as a newline. With unit test. ........ r58242 | georg.brandl | 2007-09-24 10:55:47 -0700 (Mon, 24 Sep 2007) | 2 lines Fix typo and double word. ........ r58245 | georg.brandl | 2007-09-24 10:59:28 -0700 (Mon, 24 Sep 2007) | 2 lines #1196: document default radix for int(). ........ r58247 | georg.brandl | 2007-09-24 11:08:24 -0700 (Mon, 24 Sep 2007) | 2 lines #1177: accept 2xx responses for https too, not only http. ........ r58249 | andrew.kuchling | 2007-09-24 16:45:51 -0700 (Mon, 24 Sep 2007) | 1 line Remove stray odd character; grammar fix ........ r58250 | andrew.kuchling | 2007-09-24 16:46:28 -0700 (Mon, 24 Sep 2007) | 1 line Typo fix ........ r58251 | andrew.kuchling | 2007-09-24 17:09:42 -0700 (Mon, 24 Sep 2007) | 1 line Add various items ........ r58268 | vinay.sajip | 2007-09-26 22:34:45 -0700 (Wed, 26 Sep 2007) | 1 line Change to flush and close logic to fix #1760556. ........ r58269 | vinay.sajip | 2007-09-26 22:38:51 -0700 (Wed, 26 Sep 2007) | 1 line Change to basicConfig() to fix #1021. ........ r58270 | georg.brandl | 2007-09-26 23:26:58 -0700 (Wed, 26 Sep 2007) | 2 lines #1208: document match object's boolean value. ........ r58271 | vinay.sajip | 2007-09-26 23:56:13 -0700 (Wed, 26 Sep 2007) | 1 line Minor date change. ........ r58272 | vinay.sajip | 2007-09-27 00:35:10 -0700 (Thu, 27 Sep 2007) | 1 line Change to LogRecord.__init__() to fix #1206. Note that archaic use of type(x) == types.DictType is because of keeping 1.5.2 compatibility. While this is much less relevant these days, there probably needs to be a separate commit for removing all archaic constructs at the same time. ........ r58288 | brett.cannon | 2007-09-30 12:45:10 -0700 (Sun, 30 Sep 2007) | 9 lines tuple.__repr__ did not consider a reference loop as it is not possible from Python code; but it is possible from C. object.__str__ had the issue of not expecting a type to doing something within it's tp_str implementation that could trigger an infinite recursion, but it could in C code.. Both found thanks to BaseException and how it handles its repr. Closes issue #1686386. Thanks to Thomas Herve for taking an initial stab at coming up with a solution. ........ r58289 | brett.cannon | 2007-09-30 13:37:19 -0700 (Sun, 30 Sep 2007) | 3 lines Fix error introduced by r58288; if a tuple is length 0 return its repr and don't worry about any self-referring tuples. ........ r58294 | facundo.batista | 2007-10-02 10:01:24 -0700 (Tue, 02 Oct 2007) | 11 lines Made the various is_* operations return booleans. This was discussed with Cawlishaw by mail, and he basically confirmed that to these is_* operations, there's no need to return Decimal(0) and Decimal(1) if the language supports the False and True booleans. Also added a few tests for the these functions in extra.decTest, since they are mostly untested (apart from the doctests). Thanks Mark Dickinson ........ r58295 | facundo.batista | 2007-10-02 11:21:18 -0700 (Tue, 02 Oct 2007) | 4 lines Added a class to store the digits of log(10), so that they can be made available when necessary without recomputing. Thanks Mark Dickinson ........ r58299 | mark.summerfield | 2007-10-03 01:53:21 -0700 (Wed, 03 Oct 2007) | 4 lines Added note in footnote about string comparisons about unicodedata.normalize(). ........ r58304 | raymond.hettinger | 2007-10-03 14:18:11 -0700 (Wed, 03 Oct 2007) | 1 line enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy. ........ r58305 | raymond.hettinger | 2007-10-03 17:20:27 -0700 (Wed, 03 Oct 2007) | 1 line itertools.count() no longer limited to sys.maxint. ........ r58306 | kurt.kaiser | 2007-10-03 18:49:54 -0700 (Wed, 03 Oct 2007) | 3 lines Assume that the user knows when he wants to end the line; don't insert something he didn't select or complete. ........ r58307 | kurt.kaiser | 2007-10-03 19:07:50 -0700 (Wed, 03 Oct 2007) | 2 lines Remove unused theme that was causing a fault in p3k. ........ r58308 | kurt.kaiser | 2007-10-03 19:09:17 -0700 (Wed, 03 Oct 2007) | 2 lines Clean up EditorWindow close. ........ r58309 | kurt.kaiser | 2007-10-03 19:53:07 -0700 (Wed, 03 Oct 2007) | 7 lines textView cleanup. Patch 1718043 Tal Einat. M idlelib/EditorWindow.py M idlelib/aboutDialog.py M idlelib/textView.py M idlelib/NEWS.txt ........ r58310 | kurt.kaiser | 2007-10-03 20:11:12 -0700 (Wed, 03 Oct 2007) | 3 lines configDialog cleanup. Patch 1730217 Tal Einat. ........ r58311 | neal.norwitz | 2007-10-03 23:00:48 -0700 (Wed, 03 Oct 2007) | 4 lines Coverity #151: Remove deadcode. All this code already exists above starting at line 653. ........ r58325 | fred.drake | 2007-10-04 19:46:12 -0700 (Thu, 04 Oct 2007) | 1 line wrap lines to <80 characters before fixing errors ........ r58326 | raymond.hettinger | 2007-10-04 19:47:07 -0700 (Thu, 04 Oct 2007) | 6 lines Add __asdict__() to NamedTuple and refine the docs. Add maxlen support to deque() and fixup docs. Partially fix __reduce__(). The None as a third arg was no longer supported. Still needs work on __reduce__() to handle recursive inputs. ........ r58327 | fred.drake | 2007-10-04 19:48:32 -0700 (Thu, 04 Oct 2007) | 3 lines move descriptions of ac_(in|out)_buffer_size to the right place http://bugs.python.org/issue1053 ........ r58329 | neal.norwitz | 2007-10-04 20:39:17 -0700 (Thu, 04 Oct 2007) | 3 lines dict could be NULL, so we need to XDECREF. Fix a compiler warning about passing a PyTypeObject* instead of PyObject*. ........ r58330 | neal.norwitz | 2007-10-04 20:41:19 -0700 (Thu, 04 Oct 2007) | 2 lines Fix Coverity #158: Check the correct variable. ........ r58332 | neal.norwitz | 2007-10-04 22:01:38 -0700 (Thu, 04 Oct 2007) | 7 lines Fix Coverity #159. This code was broken if save() returned a negative number since i contained a boolean value and then we compared i < 0 which should never be true. Will backport (assuming it's necessary) ........ r58334 | neal.norwitz | 2007-10-04 22:29:17 -0700 (Thu, 04 Oct 2007) | 1 line Add a note about fixing some more warnings found by Coverity. ........ r58338 | raymond.hettinger | 2007-10-05 12:07:31 -0700 (Fri, 05 Oct 2007) | 1 line Restore BEGIN/END THREADS macros which were squashed in the previous checkin ........ r58343 | gregory.p.smith | 2007-10-06 00:48:10 -0700 (Sat, 06 Oct 2007) | 3 lines Stab in the dark attempt to fix the test_bsddb3 failure on sparc and S-390 ubuntu buildbots. ........ r58344 | gregory.p.smith | 2007-10-06 00:51:59 -0700 (Sat, 06 Oct 2007) | 2 lines Allows BerkeleyDB 4.6.x >= 4.6.21 for the bsddb module. ........ r58348 | gregory.p.smith | 2007-10-06 08:47:37 -0700 (Sat, 06 Oct 2007) | 3 lines Use the host the author likely meant in the first place. pop.gmail.com is reliable. gmail.org is someones personal domain. ........ r58351 | neal.norwitz | 2007-10-06 12:16:28 -0700 (Sat, 06 Oct 2007) | 3 lines Ensure that this test will pass even if another test left an unwritable TESTFN. Also use the safe unlink in test_support instead of rolling our own here. ........ r58368 | georg.brandl | 2007-10-08 00:50:24 -0700 (Mon, 08 Oct 2007) | 3 lines #1123: fix the docs for the str.split(None, sep) case. Also expand a few other methods' docs, which had more info in the deprecated string module docs. ........ r58369 | georg.brandl | 2007-10-08 01:06:05 -0700 (Mon, 08 Oct 2007) | 2 lines Update docstring of sched, also remove an unused assignment. ........ r58370 | raymond.hettinger | 2007-10-08 02:14:28 -0700 (Mon, 08 Oct 2007) | 5 lines Add comments to NamedTuple code. Let the field spec be either a string or a non-string sequence (suggested by Martin Blais with use cases). Improve the error message in the case of a SyntaxError (caused by a duplicate field name). ........ r58371 | raymond.hettinger | 2007-10-08 02:56:29 -0700 (Mon, 08 Oct 2007) | 1 line Missed a line in the docs ........ r58372 | raymond.hettinger | 2007-10-08 03:11:51 -0700 (Mon, 08 Oct 2007) | 1 line Better variable names ........ r58376 | georg.brandl | 2007-10-08 07:12:47 -0700 (Mon, 08 Oct 2007) | 3 lines #1199: docs for tp_as_{number,sequence,mapping}, by Amaury Forgeot d'Arc. No need to merge this to py3k! ........ r58380 | raymond.hettinger | 2007-10-08 14:26:58 -0700 (Mon, 08 Oct 2007) | 1 line Eliminate camelcase function name ........ r58381 | andrew.kuchling | 2007-10-08 16:23:03 -0700 (Mon, 08 Oct 2007) | 1 line Eliminate camelcase function name ........ r58382 | raymond.hettinger | 2007-10-08 18:36:23 -0700 (Mon, 08 Oct 2007) | 1 line Make the error messages more specific ........ r58384 | gregory.p.smith | 2007-10-08 23:02:21 -0700 (Mon, 08 Oct 2007) | 10 lines Splits Modules/_bsddb.c up into bsddb.h and _bsddb.c and adds a C API object available as bsddb.db.api. This is based on the patch submitted by Duncan Grisby here: http://sourceforge.net/tracker/index.php?func=detail&aid=1551895&group_id=13900&atid=313900 See this thread for additional info: http://sourceforge.net/mailarchive/forum.php?thread_name=E1GAVDK-0002rk-Iw%40apasphere.com&forum_name=pybsddb-users It also cleans up the code a little by removing some ifdef/endifs for python prior to 2.1 and for unsupported Berkeley DB <= 3.2. ........ r58385 | gregory.p.smith | 2007-10-08 23:50:43 -0700 (Mon, 08 Oct 2007) | 5 lines Fix a double free when positioning a database cursor to a non-existant string key (and probably a few other situations with string keys). This was reported with a patch as pybsddb sourceforge bug 1708868 by jjjhhhlll at gmail. ........ r58386 | gregory.p.smith | 2007-10-09 00:19:11 -0700 (Tue, 09 Oct 2007) | 3 lines Use the highest cPickle protocol in bsddb.dbshelve. This comes from sourceforge pybsddb patch 1551443 by w_barnes. ........ r58394 | gregory.p.smith | 2007-10-09 11:26:02 -0700 (Tue, 09 Oct 2007) | 2 lines remove another sleepycat reference ........ r58396 | kurt.kaiser | 2007-10-09 12:31:30 -0700 (Tue, 09 Oct 2007) | 3 lines Allow interrupt only when executing user code in subprocess Patch 1225 Tal Einat modified from IDLE-Spoon. ........ r58399 | brett.cannon | 2007-10-09 17:07:50 -0700 (Tue, 09 Oct 2007) | 5 lines Remove file-level typedefs that were inconsistently used throughout the file. Just move over to the public API names. Closes issue1238. ........ r58401 | raymond.hettinger | 2007-10-09 17:26:46 -0700 (Tue, 09 Oct 2007) | 1 line Accept Jim Jewett's api suggestion to use None instead of -1 to indicate unbounded deques. ........ r58403 | kurt.kaiser | 2007-10-09 17:55:40 -0700 (Tue, 09 Oct 2007) | 2 lines Allow cursor color change w/o restart. Patch 1725576 Tal Einat. ........ r58404 | kurt.kaiser | 2007-10-09 18:06:47 -0700 (Tue, 09 Oct 2007) | 2 lines show paste if > 80 columns. Patch 1659326 Tal Einat. ........ r58415 | thomas.heller | 2007-10-11 12:51:32 -0700 (Thu, 11 Oct 2007) | 5 lines On OS X, use os.uname() instead of gestalt.sysv(...) to get the operating system version. This allows to use ctypes when Python was configured with --disable-toolbox-glue. ........ r58419 | neal.norwitz | 2007-10-11 20:01:01 -0700 (Thu, 11 Oct 2007) | 1 line Get rid of warning about not being able to create an existing directory. ........ r58420 | neal.norwitz | 2007-10-11 20:01:30 -0700 (Thu, 11 Oct 2007) | 1 line Get rid of warnings on a bunch of platforms by using a proper prototype. ........ r58421 | neal.norwitz | 2007-10-11 20:01:54 -0700 (Thu, 11 Oct 2007) | 4 lines Get rid of compiler warning about retval being used (returned) without being initialized. (gcc warning and Coverity 202) ........ r58422 | neal.norwitz | 2007-10-11 20:03:23 -0700 (Thu, 11 Oct 2007) | 1 line Fix Coverity 168: Close the file before returning (exiting). ........ r58423 | neal.norwitz | 2007-10-11 20:04:18 -0700 (Thu, 11 Oct 2007) | 4 lines Fix Coverity 180: Don't overallocate. We don't need structs, but pointers. Also fix a memory leak. ........ r58424 | neal.norwitz | 2007-10-11 20:05:19 -0700 (Thu, 11 Oct 2007) | 5 lines Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory would be accessed. Will backport. ........ r58425 | neal.norwitz | 2007-10-11 20:52:34 -0700 (Thu, 11 Oct 2007) | 1 line Get this module to compile with bsddb versions prior to 4.3 ........ r58430 | martin.v.loewis | 2007-10-12 01:56:52 -0700 (Fri, 12 Oct 2007) | 3 lines Bug #1216: Restore support for Visual Studio 2002. Will backport to 2.5. ........ r58433 | raymond.hettinger | 2007-10-12 10:53:11 -0700 (Fri, 12 Oct 2007) | 1 line Fix test of count.__repr__() to ignore the 'L' if the count is a long ........ r58434 | gregory.p.smith | 2007-10-12 11:44:06 -0700 (Fri, 12 Oct 2007) | 4 lines Fixes http://bugs.python.org/issue1233 - bsddb.dbshelve.DBShelf.append was useless due to inverted logic. Also adds a test case for RECNO dbs to test_dbshelve. ........ r58445 | georg.brandl | 2007-10-13 06:20:03 -0700 (Sat, 13 Oct 2007) | 2 lines Fix email example. ........ r58450 | gregory.p.smith | 2007-10-13 16:02:05 -0700 (Sat, 13 Oct 2007) | 2 lines Fix an uncollectable reference leak in bsddb.db.DBShelf.append ........ r58453 | neal.norwitz | 2007-10-13 17:18:40 -0700 (Sat, 13 Oct 2007) | 8 lines Let the O/S supply a port if none of the default ports can be used. This should make the tests more robust at the expense of allowing tests to be sloppier by not requiring them to cleanup after themselves. (It will legitamitely help when running two test suites simultaneously or if another process is already using one of the predefined ports.) Also simplifies (slightLy) the exception handling elsewhere. ........ r58459 | neal.norwitz | 2007-10-14 11:30:21 -0700 (Sun, 14 Oct 2007) | 2 lines Don't raise a string exception, they don't work anymore. ........ r58460 | neal.norwitz | 2007-10-14 11:40:37 -0700 (Sun, 14 Oct 2007) | 1 line Use unittest for assertions ........ r58468 | armin.rigo | 2007-10-15 00:48:35 -0700 (Mon, 15 Oct 2007) | 2 lines test_bigbits was not testing what it seemed to. ........ r58471 | guido.van.rossum | 2007-10-15 08:54:11 -0700 (Mon, 15 Oct 2007) | 3 lines Change a PyErr_Print() into a PyErr_Clear(), per discussion in issue 1031213. ........ r58500 | raymond.hettinger | 2007-10-16 12:18:30 -0700 (Tue, 16 Oct 2007) | 1 line Improve error messages ........ r58506 | raymond.hettinger | 2007-10-16 14:28:32 -0700 (Tue, 16 Oct 2007) | 1 line More docs, error messages, and tests ........ r58507 | andrew.kuchling | 2007-10-16 15:58:03 -0700 (Tue, 16 Oct 2007) | 1 line Add items ........ r58508 | brett.cannon | 2007-10-16 16:24:06 -0700 (Tue, 16 Oct 2007) | 3 lines Remove ``:const:`` notation on None in parameter list. Since the markup is not rendered for parameters it just showed up as ``:const:`None` `` in the output. ........ r58509 | brett.cannon | 2007-10-16 16:26:45 -0700 (Tue, 16 Oct 2007) | 3 lines Re-order some functions whose parameters differ between PyObject and const char * so that they are next to each other. ........ r58522 | armin.rigo | 2007-10-17 11:46:37 -0700 (Wed, 17 Oct 2007) | 5 lines Fix the overflow checking of list_repeat. Introduce overflow checking into list_inplace_repeat. Backport candidate, possibly. ........ r58530 | facundo.batista | 2007-10-17 20:16:03 -0700 (Wed, 17 Oct 2007) | 7 lines Issue #1580738. When HTTPConnection reads the whole stream with read(), it closes itself. When the stream is read in several calls to read(n), it should behave in the same way if HTTPConnection knows where the end of the stream is (through self.length). Added a test case for this behaviour. ........ r58531 | facundo.batista | 2007-10-17 20:44:48 -0700 (Wed, 17 Oct 2007) | 3 lines Issue 1289, just a typo. ........ r58532 | gregory.p.smith | 2007-10-18 00:56:54 -0700 (Thu, 18 Oct 2007) | 4 lines cleanup test_dbtables to use mkdtemp. cleanup dbtables to pass txn as a keyword argument whenever possible to avoid bugs and confusion. (dbtables.py line 447 self.db.get using txn as a non-keyword was an actual bug due to this) ........ r58533 | gregory.p.smith | 2007-10-18 01:34:20 -0700 (Thu, 18 Oct 2007) | 4 lines Fix a weird bug in dbtables: if it chose a random rowid string that contained NULL bytes it would cause the database all sorts of problems in the future leading to very strange random failures and corrupt dbtables.bsdTableDb dbs. ........ r58534 | gregory.p.smith | 2007-10-18 09:32:02 -0700 (Thu, 18 Oct 2007) | 3 lines A cleaner fix than the one committed last night. Generate random rowids that do not contain null bytes. ........ r58537 | gregory.p.smith | 2007-10-18 10:17:57 -0700 (Thu, 18 Oct 2007) | 2 lines mention bsddb fixes. ........ r58538 | raymond.hettinger | 2007-10-18 14:13:06 -0700 (Thu, 18 Oct 2007) | 1 line Remove useless warning ........ r58539 | gregory.p.smith | 2007-10-19 00:31:20 -0700 (Fri, 19 Oct 2007) | 2 lines squelch the warning that this test is supposed to trigger. ........ r58542 | georg.brandl | 2007-10-19 05:32:39 -0700 (Fri, 19 Oct 2007) | 2 lines Clarify wording for apply(). ........ r58544 | mark.summerfield | 2007-10-19 05:48:17 -0700 (Fri, 19 Oct 2007) | 3 lines Added a cross-ref to each other. ........ r58545 | georg.brandl | 2007-10-19 10:38:49 -0700 (Fri, 19 Oct 2007) | 2 lines #1284: "S" means "seen", not unread. ........ r58548 | thomas.heller | 2007-10-19 11:11:41 -0700 (Fri, 19 Oct 2007) | 4 lines Fix ctypes on 32-bit systems when Python is configured --with-system-ffi. See also https://bugs.launchpad.net/bugs/72505. Ported from release25-maint branch. ........ r58550 | facundo.batista | 2007-10-19 12:25:57 -0700 (Fri, 19 Oct 2007) | 8 lines The constructor from tuple was way too permissive: it allowed bad coefficient numbers, floats in the sign, and other details that generated directly the wrong number in the best case, or triggered misfunctionality in the alorithms. Test cases added for these issues. Thanks Mark Dickinson. ........ r58559 | georg.brandl | 2007-10-20 06:22:53 -0700 (Sat, 20 Oct 2007) | 2 lines Fix code being interpreted as a target. ........ r58561 | georg.brandl | 2007-10-20 06:36:24 -0700 (Sat, 20 Oct 2007) | 2 lines Document new "cmdoption" directive. ........ r58562 | georg.brandl | 2007-10-20 08:21:22 -0700 (Sat, 20 Oct 2007) | 2 lines Make a path more Unix-standardy. ........ r58564 | georg.brandl | 2007-10-20 10:51:39 -0700 (Sat, 20 Oct 2007) | 2 lines Document new directive "envvar". ........ r58567 | georg.brandl | 2007-10-20 11:08:14 -0700 (Sat, 20 Oct 2007) | 6 lines * Add new toplevel chapter, "Using Python." (how to install, configure and setup python on different platforms -- at least in theory.) * Move the Python on Mac docs in that chapter. * Add a new chapter about the command line invocation, by stargaming. ........ r58568 | georg.brandl | 2007-10-20 11:33:20 -0700 (Sat, 20 Oct 2007) | 2 lines Change title, for now. ........ r58569 | georg.brandl | 2007-10-20 11:39:25 -0700 (Sat, 20 Oct 2007) | 2 lines Add entry to ACKS. ........ r58570 | georg.brandl | 2007-10-20 12:05:45 -0700 (Sat, 20 Oct 2007) | 2 lines Clarify -E docs. ........ r58571 | georg.brandl | 2007-10-20 12:08:36 -0700 (Sat, 20 Oct 2007) | 2 lines Even more clarification. ........ r58572 | andrew.kuchling | 2007-10-20 12:25:37 -0700 (Sat, 20 Oct 2007) | 1 line Fix protocol name ........ r58573 | andrew.kuchling | 2007-10-20 12:35:18 -0700 (Sat, 20 Oct 2007) | 1 line Various items ........ r58574 | andrew.kuchling | 2007-10-20 12:39:35 -0700 (Sat, 20 Oct 2007) | 1 line Use correct header line ........ r58576 | armin.rigo | 2007-10-21 02:14:15 -0700 (Sun, 21 Oct 2007) | 3 lines Add a crasher for the long-standing issue with closing a file while another thread uses it. ........ r58577 | georg.brandl | 2007-10-21 03:01:56 -0700 (Sun, 21 Oct 2007) | 2 lines Remove duplicate crasher. ........ r58578 | georg.brandl | 2007-10-21 03:24:20 -0700 (Sun, 21 Oct 2007) | 2 lines Unify "byte code" to "bytecode". Also sprinkle :term: markup for it. ........ r58579 | georg.brandl | 2007-10-21 03:32:54 -0700 (Sun, 21 Oct 2007) | 2 lines Add markup to new function descriptions. ........ r58580 | georg.brandl | 2007-10-21 03:45:46 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for descriptors. ........ r58581 | georg.brandl | 2007-10-21 03:46:24 -0700 (Sun, 21 Oct 2007) | 2 lines Unify "file-descriptor" to "file descriptor". ........ r58582 | georg.brandl | 2007-10-21 03:52:38 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term: for generators. ........ r58583 | georg.brandl | 2007-10-21 05:10:28 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for iterator. ........ r58584 | georg.brandl | 2007-10-21 05:15:05 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for "new-style class". ........ r58588 | neal.norwitz | 2007-10-21 21:47:54 -0700 (Sun, 21 Oct 2007) | 1 line Add Chris Monson so he can edit PEPs. ........ r58594 | guido.van.rossum | 2007-10-22 09:27:19 -0700 (Mon, 22 Oct 2007) | 4 lines Issue #1307, patch by Derek Shockey. When "MAIL" is received without args, an exception happens instead of sending a 501 syntax error response. ........ r58598 | travis.oliphant | 2007-10-22 19:40:56 -0700 (Mon, 22 Oct 2007) | 1 line Add phuang patch from Issue 708374 which adds offset parameter to mmap module. ........ r58601 | neal.norwitz | 2007-10-22 22:44:27 -0700 (Mon, 22 Oct 2007) | 2 lines Bug #1313, fix typo (wrong variable name) in example. ........ r58609 | georg.brandl | 2007-10-23 11:21:35 -0700 (Tue, 23 Oct 2007) | 2 lines Update Pygments version from externals. ........ r58618 | guido.van.rossum | 2007-10-23 12:25:41 -0700 (Tue, 23 Oct 2007) | 3 lines Issue 1307 by Derek Shockey, fox the same bug for RCPT. Neal: please backport! ........ r58620 | raymond.hettinger | 2007-10-23 13:37:41 -0700 (Tue, 23 Oct 2007) | 1 line Shorter name for namedtuple() ........ r58621 | andrew.kuchling | 2007-10-23 13:55:47 -0700 (Tue, 23 Oct 2007) | 1 line Update name ........ r58622 | raymond.hettinger | 2007-10-23 14:23:07 -0700 (Tue, 23 Oct 2007) | 1 line Fixup news entry ........ r58623 | raymond.hettinger | 2007-10-23 18:28:33 -0700 (Tue, 23 Oct 2007) | 1 line Optimize sum() for integer and float inputs. ........ r58624 | raymond.hettinger | 2007-10-23 19:05:51 -0700 (Tue, 23 Oct 2007) | 1 line Fixup error return and add support for intermixed ints and floats/ ........ r58628 | vinay.sajip | 2007-10-24 03:47:06 -0700 (Wed, 24 Oct 2007) | 1 line Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__() ........ r58641 | facundo.batista | 2007-10-24 12:11:08 -0700 (Wed, 24 Oct 2007) | 4 lines Issue 1290. CharacterData.__repr__ was constructing a string in response that keeped having a non-ascii character. ........ r58643 | thomas.heller | 2007-10-24 12:50:45 -0700 (Wed, 24 Oct 2007) | 1 line Added unittest for calling a function with paramflags (backport from py3k branch). ........ r58645 | matthias.klose | 2007-10-24 13:00:44 -0700 (Wed, 24 Oct 2007) | 2 lines - Build using system ffi library on arm*-linux*. ........ r58651 | georg.brandl | 2007-10-24 14:40:38 -0700 (Wed, 24 Oct 2007) | 2 lines Bug #1287: make os.environ.pop() work as expected. ........ r58652 | raymond.hettinger | 2007-10-24 19:26:58 -0700 (Wed, 24 Oct 2007) | 1 line Missing DECREFs ........ r58653 | matthias.klose | 2007-10-24 23:37:24 -0700 (Wed, 24 Oct 2007) | 2 lines - Build using system ffi library on arm*-linux*, pass --with-system-ffi to CONFIG_ARGS ........ r58655 | thomas.heller | 2007-10-25 12:47:32 -0700 (Thu, 25 Oct 2007) | 2 lines ffi_type_longdouble may be already #defined. See issue 1324. ........ r58656 | kurt.kaiser | 2007-10-25 15:43:45 -0700 (Thu, 25 Oct 2007) | 3 lines Correct an ancient bug in an unused path by removing that path: register() is now idempotent. ........ r58660 | kurt.kaiser | 2007-10-25 17:10:09 -0700 (Thu, 25 Oct 2007) | 4 lines 1. Add comments to provide top-level documentation. 2. Refactor to use more descriptive names. 3. Enhance tests in main(). ........ r58675 | georg.brandl | 2007-10-26 11:30:41 -0700 (Fri, 26 Oct 2007) | 2 lines Fix new pop() method on os.environ on ignorecase-platforms. ........ r58696 | neal.norwitz | 2007-10-27 15:32:21 -0700 (Sat, 27 Oct 2007) | 1 line Update URL for Pygments. 0.8.1 is no longer available ........ r58697 | hyeshik.chang | 2007-10-28 04:19:02 -0700 (Sun, 28 Oct 2007) | 3 lines - Add support for FreeBSD 8 which is recently forked from FreeBSD 7. - Regenerate IN module for most recent maintenance tree of FreeBSD 6 and 7. ........ r58698 | hyeshik.chang | 2007-10-28 05:38:09 -0700 (Sun, 28 Oct 2007) | 2 lines Enable platform-specific tweaks for FreeBSD 8 (exactly same to FreeBSD 7's yet) ........ r58700 | kurt.kaiser | 2007-10-28 12:03:59 -0700 (Sun, 28 Oct 2007) | 2 lines Add confirmation dialog before printing. Patch 1717170 Tal Einat. ........ r58706 | guido.van.rossum | 2007-10-29 13:52:45 -0700 (Mon, 29 Oct 2007) | 3 lines Patch 1353 by Jacob Winther. Add mp4 mapping to mimetypes.py. ........ r58709 | guido.van.rossum | 2007-10-29 15:15:05 -0700 (Mon, 29 Oct 2007) | 6 lines Backport fixes for the code that decodes octal escapes (and for PyString also hex escapes) -- this was reaching beyond the end of the input string buffer, even though it is not supposed to be \0-terminated. This has no visible effect but is clearly the correct thing to do. (In 3.0 it had a visible effect after removing ob_sstate from PyString.) ........ r58710 | kurt.kaiser | 2007-10-29 19:38:54 -0700 (Mon, 29 Oct 2007) | 7 lines check in Tal Einat's update to tabpage.py Patch 1612746 M configDialog.py M NEWS.txt AM tabbedpages.py ........ r58715 | georg.brandl | 2007-10-30 10:51:18 -0700 (Tue, 30 Oct 2007) | 2 lines Use correct markup. ........ r58716 | georg.brandl | 2007-10-30 10:57:12 -0700 (Tue, 30 Oct 2007) | 2 lines Make example about hiding None return values at the prompt clearer. ........ r58728 | neal.norwitz | 2007-10-30 23:33:20 -0700 (Tue, 30 Oct 2007) | 1 line Fix some compiler warnings for signed comparisons on Unix and Windows. ........ r58731 | martin.v.loewis | 2007-10-31 10:19:33 -0700 (Wed, 31 Oct 2007) | 2 lines Adding Christian Heimes. ........ r58737 | raymond.hettinger | 2007-10-31 14:57:58 -0700 (Wed, 31 Oct 2007) | 1 line Clarify the reasons why pickle is almost always better than marshal ........ r58739 | raymond.hettinger | 2007-10-31 15:15:49 -0700 (Wed, 31 Oct 2007) | 1 line Sets are marshalable. ........
1343 lines
43 KiB
Python
1343 lines
43 KiB
Python
# Copyright (c) 2004 Python Software Foundation.
|
|
# All rights reserved.
|
|
|
|
# Written by Eric Price <eprice at tjhsst.edu>
|
|
# and Facundo Batista <facundo at taniquetil.com.ar>
|
|
# and Raymond Hettinger <python at rcn.com>
|
|
# and Aahz (aahz at pobox.com)
|
|
# and Tim Peters
|
|
|
|
"""
|
|
These are the test cases for the Decimal module.
|
|
|
|
There are two groups of tests, Arithmetic and Behaviour. The former test
|
|
the Decimal arithmetic using the tests provided by Mike Cowlishaw. The latter
|
|
test the pythonic behaviour according to PEP 327.
|
|
|
|
Cowlishaw's tests can be downloaded from:
|
|
|
|
www2.hursley.ibm.com/decimal/dectest.zip
|
|
|
|
This test module can be called from command line with one parameter (Arithmetic
|
|
or Behaviour) to test each part, or without parameter to test both parts. If
|
|
you're working through IDLE, you can import this test module and call test_main()
|
|
with the corresponding argument.
|
|
"""
|
|
from __future__ import with_statement
|
|
|
|
import unittest
|
|
import glob
|
|
import os, sys
|
|
import pickle, copy
|
|
from decimal import *
|
|
from test.test_support import (TestSkipped, run_unittest, run_doctest,
|
|
is_resource_enabled)
|
|
import random
|
|
try:
|
|
import threading
|
|
except ImportError:
|
|
threading = None
|
|
|
|
# Useful Test Constant
|
|
Signals = tuple(getcontext().flags.keys())
|
|
|
|
# Tests are built around these assumed context defaults.
|
|
# test_main() restores the original context.
|
|
def init():
|
|
global ORIGINAL_CONTEXT
|
|
ORIGINAL_CONTEXT = getcontext().copy()
|
|
DefaultContext.prec = 9
|
|
DefaultContext.rounding = ROUND_HALF_EVEN
|
|
DefaultContext.traps = dict.fromkeys(Signals, 0)
|
|
setcontext(DefaultContext)
|
|
|
|
TESTDATADIR = 'decimaltestdata'
|
|
if __name__ == '__main__':
|
|
file = sys.argv[0]
|
|
else:
|
|
file = __file__
|
|
testdir = os.path.dirname(file) or os.curdir
|
|
directory = testdir + os.sep + TESTDATADIR + os.sep
|
|
|
|
skip_expected = not os.path.isdir(directory)
|
|
|
|
# Make sure it actually raises errors when not expected and caught in flags
|
|
# Slower, since it runs some things several times.
|
|
EXTENDEDERRORTEST = False
|
|
|
|
#Map the test cases' error names to the actual errors
|
|
ErrorNames = {'clamped' : Clamped,
|
|
'conversion_syntax' : InvalidOperation,
|
|
'division_by_zero' : DivisionByZero,
|
|
'division_impossible' : InvalidOperation,
|
|
'division_undefined' : InvalidOperation,
|
|
'inexact' : Inexact,
|
|
'invalid_context' : InvalidOperation,
|
|
'invalid_operation' : InvalidOperation,
|
|
'overflow' : Overflow,
|
|
'rounded' : Rounded,
|
|
'subnormal' : Subnormal,
|
|
'underflow' : Underflow}
|
|
|
|
|
|
def Nonfunction(*args):
|
|
"""Doesn't do anything."""
|
|
return None
|
|
|
|
RoundingDict = {'ceiling' : ROUND_CEILING, #Maps test-case names to roundings.
|
|
'down' : ROUND_DOWN,
|
|
'floor' : ROUND_FLOOR,
|
|
'half_down' : ROUND_HALF_DOWN,
|
|
'half_even' : ROUND_HALF_EVEN,
|
|
'half_up' : ROUND_HALF_UP,
|
|
'up' : ROUND_UP,
|
|
'05up' : ROUND_05UP}
|
|
|
|
# Name adapter to be able to change the Decimal and Context
|
|
# interface without changing the test files from Cowlishaw
|
|
nameAdapter = {'and':'logical_and',
|
|
'apply':'_apply',
|
|
'class':'number_class',
|
|
'comparesig':'compare_signal',
|
|
'comparetotal':'compare_total',
|
|
'comparetotmag':'compare_total_mag',
|
|
'copy':'copy_decimal',
|
|
'copyabs':'copy_abs',
|
|
'copynegate':'copy_negate',
|
|
'copysign':'copy_sign',
|
|
'divideint':'divide_int',
|
|
'invert':'logical_invert',
|
|
'iscanonical':'is_canonical',
|
|
'isfinite':'is_finite',
|
|
'isinfinite':'is_infinite',
|
|
'isnan':'is_nan',
|
|
'isnormal':'is_normal',
|
|
'isqnan':'is_qnan',
|
|
'issigned':'is_signed',
|
|
'issnan':'is_snan',
|
|
'issubnormal':'is_subnormal',
|
|
'iszero':'is_zero',
|
|
'maxmag':'max_mag',
|
|
'minmag':'min_mag',
|
|
'nextminus':'next_minus',
|
|
'nextplus':'next_plus',
|
|
'nexttoward':'next_toward',
|
|
'or':'logical_or',
|
|
'reduce':'normalize',
|
|
'remaindernear':'remainder_near',
|
|
'samequantum':'same_quantum',
|
|
'squareroot':'sqrt',
|
|
'toeng':'to_eng_string',
|
|
'tointegral':'to_integral_value',
|
|
'tointegralx':'to_integral_exact',
|
|
'tosci':'to_sci_string',
|
|
'xor':'logical_xor',
|
|
}
|
|
|
|
# The following functions return True/False rather than a Decimal instance
|
|
|
|
LOGICAL_FUNCTIONS = (
|
|
'is_canonical',
|
|
'is_finite',
|
|
'is_infinite',
|
|
'is_nan',
|
|
'is_normal',
|
|
'is_qnan',
|
|
'is_signed',
|
|
'is_snan',
|
|
'is_subnormal',
|
|
'is_zero',
|
|
'same_quantum',
|
|
)
|
|
|
|
# For some operations (currently exp, ln, log10, power), the decNumber
|
|
# reference implementation imposes additional restrictions on the
|
|
# context and operands. These restrictions are not part of the
|
|
# specification; however, the effect of these restrictions does show
|
|
# up in some of the testcases. We skip testcases that violate these
|
|
# restrictions, since Decimal behaves differently from decNumber for
|
|
# these testcases so these testcases would otherwise fail.
|
|
|
|
decNumberRestricted = ('power', 'ln', 'log10', 'exp')
|
|
DEC_MAX_MATH = 999999
|
|
def outside_decNumber_bounds(v, context):
|
|
if (context.prec > DEC_MAX_MATH or
|
|
context.Emax > DEC_MAX_MATH or
|
|
-context.Emin > DEC_MAX_MATH):
|
|
return True
|
|
if not v._is_special and v and (
|
|
len(v._int) > DEC_MAX_MATH or
|
|
v.adjusted() > DEC_MAX_MATH or
|
|
v.adjusted() < 1-2*DEC_MAX_MATH):
|
|
return True
|
|
return False
|
|
|
|
class DecimalTest(unittest.TestCase):
|
|
"""Class which tests the Decimal class against the test cases.
|
|
|
|
Changed for unittest.
|
|
"""
|
|
def setUp(self):
|
|
self.context = Context()
|
|
for key in DefaultContext.traps.keys():
|
|
DefaultContext.traps[key] = 1
|
|
self.ignore_list = ['#']
|
|
# Basically, a # means return NaN InvalidOperation.
|
|
# Different from a sNaN in trim
|
|
|
|
self.ChangeDict = {'precision' : self.change_precision,
|
|
'rounding' : self.change_rounding_method,
|
|
'maxexponent' : self.change_max_exponent,
|
|
'minexponent' : self.change_min_exponent,
|
|
'clamp' : self.change_clamp}
|
|
|
|
def tearDown(self):
|
|
"""Cleaning up enviroment."""
|
|
# leaving context in original state
|
|
for key in DefaultContext.traps.keys():
|
|
DefaultContext.traps[key] = 0
|
|
return
|
|
|
|
def eval_file(self, file):
|
|
global skip_expected
|
|
if skip_expected:
|
|
raise TestSkipped
|
|
return
|
|
for line in open(file):
|
|
line = line.replace('\r\n', '').replace('\n', '')
|
|
#print line
|
|
try:
|
|
t = self.eval_line(line)
|
|
except DecimalException as exception:
|
|
#Exception raised where there shoudn't have been one.
|
|
self.fail('Exception "'+exception.__class__.__name__ + '" raised on line '+line)
|
|
|
|
return
|
|
|
|
def eval_line(self, s):
|
|
if s.find(' -> ') >= 0 and s[:2] != '--' and not s.startswith(' --'):
|
|
s = (s.split('->')[0] + '->' +
|
|
s.split('->')[1].split('--')[0]).strip()
|
|
else:
|
|
s = s.split('--')[0].strip()
|
|
|
|
for ignore in self.ignore_list:
|
|
if s.find(ignore) >= 0:
|
|
#print s.split()[0], 'NotImplemented--', ignore
|
|
return
|
|
if not s:
|
|
return
|
|
elif ':' in s:
|
|
return self.eval_directive(s)
|
|
else:
|
|
return self.eval_equation(s)
|
|
|
|
def eval_directive(self, s):
|
|
funct, value = (x.strip().lower() for x in s.split(':'))
|
|
if funct == 'rounding':
|
|
value = RoundingDict[value]
|
|
else:
|
|
try:
|
|
value = int(value)
|
|
except ValueError:
|
|
pass
|
|
|
|
funct = self.ChangeDict.get(funct, Nonfunction)
|
|
funct(value)
|
|
|
|
def eval_equation(self, s):
|
|
#global DEFAULT_PRECISION
|
|
#print DEFAULT_PRECISION
|
|
|
|
if not TEST_ALL and random.random() < 0.90:
|
|
return
|
|
|
|
try:
|
|
Sides = s.split('->')
|
|
L = Sides[0].strip().split()
|
|
id = L[0]
|
|
if DEBUG:
|
|
print("Test ", id, end=" ")
|
|
funct = L[1].lower()
|
|
valstemp = L[2:]
|
|
L = Sides[1].strip().split()
|
|
ans = L[0]
|
|
exceptions = L[1:]
|
|
except (TypeError, AttributeError, IndexError):
|
|
raise InvalidOperation
|
|
def FixQuotes(val):
|
|
val = val.replace("''", 'SingleQuote').replace('""', 'DoubleQuote')
|
|
val = val.replace("'", '').replace('"', '')
|
|
val = val.replace('SingleQuote', "'").replace('DoubleQuote', '"')
|
|
return val
|
|
fname = nameAdapter.get(funct, funct)
|
|
if fname == 'rescale':
|
|
return
|
|
funct = getattr(self.context, fname)
|
|
vals = []
|
|
conglomerate = ''
|
|
quote = 0
|
|
theirexceptions = [ErrorNames[x.lower()] for x in exceptions]
|
|
|
|
for exception in Signals:
|
|
self.context.traps[exception] = 1 #Catch these bugs...
|
|
for exception in theirexceptions:
|
|
self.context.traps[exception] = 0
|
|
for i, val in enumerate(valstemp):
|
|
if val.count("'") % 2 == 1:
|
|
quote = 1 - quote
|
|
if quote:
|
|
conglomerate = conglomerate + ' ' + val
|
|
continue
|
|
else:
|
|
val = conglomerate + val
|
|
conglomerate = ''
|
|
v = FixQuotes(val)
|
|
if fname in ('to_sci_string', 'to_eng_string'):
|
|
if EXTENDEDERRORTEST:
|
|
for error in theirexceptions:
|
|
self.context.traps[error] = 1
|
|
try:
|
|
funct(self.context.create_decimal(v))
|
|
except error:
|
|
pass
|
|
except Signals as e:
|
|
self.fail("Raised %s in %s when %s disabled" % \
|
|
(e, s, error))
|
|
else:
|
|
self.fail("Did not raise %s in %s" % (error, s))
|
|
self.context.traps[error] = 0
|
|
v = self.context.create_decimal(v)
|
|
else:
|
|
v = Decimal(v, self.context)
|
|
vals.append(v)
|
|
|
|
ans = FixQuotes(ans)
|
|
|
|
# skip tests that are related to bounds imposed in the decNumber
|
|
# reference implementation
|
|
if fname in decNumberRestricted:
|
|
if fname == 'power':
|
|
if not (vals[1]._isinteger() and
|
|
-1999999997 <= vals[1] <= 999999999):
|
|
if outside_decNumber_bounds(vals[0], self.context) or \
|
|
outside_decNumber_bounds(vals[1], self.context):
|
|
#print "Skipping test %s" % s
|
|
return
|
|
else:
|
|
if outside_decNumber_bounds(vals[0], self.context):
|
|
#print "Skipping test %s" % s
|
|
return
|
|
|
|
|
|
if EXTENDEDERRORTEST and fname not in ('to_sci_string', 'to_eng_string'):
|
|
for error in theirexceptions:
|
|
self.context.traps[error] = 1
|
|
try:
|
|
funct(*vals)
|
|
except error:
|
|
pass
|
|
except Signals as e:
|
|
self.fail("Raised %s in %s when %s disabled" % \
|
|
(e, s, error))
|
|
else:
|
|
self.fail("Did not raise %s in %s" % (error, s))
|
|
self.context.traps[error] = 0
|
|
if DEBUG:
|
|
print("--", self.context)
|
|
try:
|
|
result = str(funct(*vals))
|
|
if fname in LOGICAL_FUNCTIONS:
|
|
result = str(int(eval(result))) # 'True', 'False' -> '1', '0'
|
|
except Signals as error:
|
|
self.fail("Raised %s in %s" % (error, s))
|
|
except: #Catch any error long enough to state the test case.
|
|
print("ERROR:", s)
|
|
raise
|
|
|
|
myexceptions = self.getexceptions()
|
|
self.context.clear_flags()
|
|
|
|
myexceptions.sort(key=repr)
|
|
theirexceptions.sort(key=repr)
|
|
|
|
self.assertEqual(result, ans,
|
|
'Incorrect answer for ' + s + ' -- got ' + result)
|
|
self.assertEqual(myexceptions, theirexceptions,
|
|
'Incorrect flags set in ' + s + ' -- got ' + str(myexceptions))
|
|
return
|
|
|
|
def getexceptions(self):
|
|
return [e for e in Signals if self.context.flags[e]]
|
|
|
|
def change_precision(self, prec):
|
|
self.context.prec = prec
|
|
def change_rounding_method(self, rounding):
|
|
self.context.rounding = rounding
|
|
def change_min_exponent(self, exp):
|
|
self.context.Emin = exp
|
|
def change_max_exponent(self, exp):
|
|
self.context.Emax = exp
|
|
def change_clamp(self, clamp):
|
|
self.context._clamp = clamp
|
|
|
|
|
|
|
|
# The following classes test the behaviour of Decimal according to PEP 327
|
|
|
|
class DecimalExplicitConstructionTest(unittest.TestCase):
|
|
'''Unit tests for Explicit Construction cases of Decimal.'''
|
|
|
|
def test_explicit_empty(self):
|
|
self.assertEqual(Decimal(), Decimal("0"))
|
|
|
|
def test_explicit_from_None(self):
|
|
self.assertRaises(TypeError, Decimal, None)
|
|
|
|
def test_explicit_from_int(self):
|
|
|
|
#positive
|
|
d = Decimal(45)
|
|
self.assertEqual(str(d), '45')
|
|
|
|
#very large positive
|
|
d = Decimal(500000123)
|
|
self.assertEqual(str(d), '500000123')
|
|
|
|
#negative
|
|
d = Decimal(-45)
|
|
self.assertEqual(str(d), '-45')
|
|
|
|
#zero
|
|
d = Decimal(0)
|
|
self.assertEqual(str(d), '0')
|
|
|
|
def test_explicit_from_string(self):
|
|
|
|
#empty
|
|
self.assertEqual(str(Decimal('')), 'NaN')
|
|
|
|
#int
|
|
self.assertEqual(str(Decimal('45')), '45')
|
|
|
|
#float
|
|
self.assertEqual(str(Decimal('45.34')), '45.34')
|
|
|
|
#engineer notation
|
|
self.assertEqual(str(Decimal('45e2')), '4.5E+3')
|
|
|
|
#just not a number
|
|
self.assertEqual(str(Decimal('ugly')), 'NaN')
|
|
|
|
def test_explicit_from_tuples(self):
|
|
|
|
#zero
|
|
d = Decimal( (0, (0,), 0) )
|
|
self.assertEqual(str(d), '0')
|
|
|
|
#int
|
|
d = Decimal( (1, (4, 5), 0) )
|
|
self.assertEqual(str(d), '-45')
|
|
|
|
#float
|
|
d = Decimal( (0, (4, 5, 3, 4), -2) )
|
|
self.assertEqual(str(d), '45.34')
|
|
|
|
#weird
|
|
d = Decimal( (1, (4, 3, 4, 9, 1, 3, 5, 3, 4), -25) )
|
|
self.assertEqual(str(d), '-4.34913534E-17')
|
|
|
|
#wrong number of items
|
|
self.assertRaises(ValueError, Decimal, (1, (4, 3, 4, 9, 1)) )
|
|
|
|
#bad sign
|
|
self.assertRaises(ValueError, Decimal, (8, (4, 3, 4, 9, 1), 2) )
|
|
self.assertRaises(ValueError, Decimal, (0., (4, 3, 4, 9, 1), 2) )
|
|
self.assertRaises(ValueError, Decimal, (Decimal(1), (4, 3, 4, 9, 1), 2))
|
|
|
|
#bad exp
|
|
self.assertRaises(ValueError, Decimal, (1, (4, 3, 4, 9, 1), 'wrong!') )
|
|
self.assertRaises(ValueError, Decimal, (1, (4, 3, 4, 9, 1), 0.) )
|
|
self.assertRaises(ValueError, Decimal, (1, (4, 3, 4, 9, 1), '1') )
|
|
|
|
#bad coefficients
|
|
self.assertRaises(ValueError, Decimal, (1, (4, 3, 4, None, 1), 2) )
|
|
self.assertRaises(ValueError, Decimal, (1, (4, -3, 4, 9, 1), 2) )
|
|
self.assertRaises(ValueError, Decimal, (1, (4, 10, 4, 9, 1), 2) )
|
|
|
|
def test_explicit_from_Decimal(self):
|
|
|
|
#positive
|
|
d = Decimal(45)
|
|
e = Decimal(d)
|
|
self.assertEqual(str(e), '45')
|
|
self.assertNotEqual(id(d), id(e))
|
|
|
|
#very large positive
|
|
d = Decimal(500000123)
|
|
e = Decimal(d)
|
|
self.assertEqual(str(e), '500000123')
|
|
self.assertNotEqual(id(d), id(e))
|
|
|
|
#negative
|
|
d = Decimal(-45)
|
|
e = Decimal(d)
|
|
self.assertEqual(str(e), '-45')
|
|
self.assertNotEqual(id(d), id(e))
|
|
|
|
#zero
|
|
d = Decimal(0)
|
|
e = Decimal(d)
|
|
self.assertEqual(str(e), '0')
|
|
self.assertNotEqual(id(d), id(e))
|
|
|
|
def test_explicit_context_create_decimal(self):
|
|
|
|
nc = copy.copy(getcontext())
|
|
nc.prec = 3
|
|
|
|
# empty
|
|
d = Decimal()
|
|
self.assertEqual(str(d), '0')
|
|
d = nc.create_decimal()
|
|
self.assertEqual(str(d), '0')
|
|
|
|
# from None
|
|
self.assertRaises(TypeError, nc.create_decimal, None)
|
|
|
|
# from int
|
|
d = nc.create_decimal(456)
|
|
self.failUnless(isinstance(d, Decimal))
|
|
self.assertEqual(nc.create_decimal(45678),
|
|
nc.create_decimal('457E+2'))
|
|
|
|
# from string
|
|
d = Decimal('456789')
|
|
self.assertEqual(str(d), '456789')
|
|
d = nc.create_decimal('456789')
|
|
self.assertEqual(str(d), '4.57E+5')
|
|
|
|
# from tuples
|
|
d = Decimal( (1, (4, 3, 4, 9, 1, 3, 5, 3, 4), -25) )
|
|
self.assertEqual(str(d), '-4.34913534E-17')
|
|
d = nc.create_decimal( (1, (4, 3, 4, 9, 1, 3, 5, 3, 4), -25) )
|
|
self.assertEqual(str(d), '-4.35E-17')
|
|
|
|
# from Decimal
|
|
prevdec = Decimal(500000123)
|
|
d = Decimal(prevdec)
|
|
self.assertEqual(str(d), '500000123')
|
|
d = nc.create_decimal(prevdec)
|
|
self.assertEqual(str(d), '5.00E+8')
|
|
|
|
|
|
class DecimalImplicitConstructionTest(unittest.TestCase):
|
|
'''Unit tests for Implicit Construction cases of Decimal.'''
|
|
|
|
def test_implicit_from_None(self):
|
|
self.assertRaises(TypeError, eval, 'Decimal(5) + None', globals())
|
|
|
|
def test_implicit_from_int(self):
|
|
#normal
|
|
self.assertEqual(str(Decimal(5) + 45), '50')
|
|
#exceeding precision
|
|
self.assertEqual(Decimal(5) + 123456789000, Decimal(123456789000))
|
|
|
|
def test_implicit_from_string(self):
|
|
self.assertRaises(TypeError, eval, 'Decimal(5) + "3"', globals())
|
|
|
|
def test_implicit_from_float(self):
|
|
self.assertRaises(TypeError, eval, 'Decimal(5) + 2.2', globals())
|
|
|
|
def test_implicit_from_Decimal(self):
|
|
self.assertEqual(Decimal(5) + Decimal(45), Decimal(50))
|
|
|
|
def test_rop(self):
|
|
# Allow other classes to be trained to interact with Decimals
|
|
class E:
|
|
def __divmod__(self, other):
|
|
return 'divmod ' + str(other)
|
|
def __rdivmod__(self, other):
|
|
return str(other) + ' rdivmod'
|
|
def __lt__(self, other):
|
|
return 'lt ' + str(other)
|
|
def __gt__(self, other):
|
|
return 'gt ' + str(other)
|
|
def __le__(self, other):
|
|
return 'le ' + str(other)
|
|
def __ge__(self, other):
|
|
return 'ge ' + str(other)
|
|
def __eq__(self, other):
|
|
return 'eq ' + str(other)
|
|
def __ne__(self, other):
|
|
return 'ne ' + str(other)
|
|
|
|
self.assertEqual(divmod(E(), Decimal(10)), 'divmod 10')
|
|
self.assertEqual(divmod(Decimal(10), E()), '10 rdivmod')
|
|
self.assertEqual(eval('Decimal(10) < E()'), 'gt 10')
|
|
self.assertEqual(eval('Decimal(10) > E()'), 'lt 10')
|
|
self.assertEqual(eval('Decimal(10) <= E()'), 'ge 10')
|
|
self.assertEqual(eval('Decimal(10) >= E()'), 'le 10')
|
|
self.assertEqual(eval('Decimal(10) == E()'), 'eq 10')
|
|
self.assertEqual(eval('Decimal(10) != E()'), 'ne 10')
|
|
|
|
# insert operator methods and then exercise them
|
|
oplist = [
|
|
('+', '__add__', '__radd__'),
|
|
('-', '__sub__', '__rsub__'),
|
|
('*', '__mul__', '__rmul__'),
|
|
('/', '__truediv__', '__rtruediv__'),
|
|
('%', '__mod__', '__rmod__'),
|
|
('//', '__floordiv__', '__rfloordiv__'),
|
|
('**', '__pow__', '__rpow__')
|
|
]
|
|
|
|
for sym, lop, rop in oplist:
|
|
setattr(E, lop, lambda self, other: 'str' + lop + str(other))
|
|
setattr(E, rop, lambda self, other: str(other) + rop + 'str')
|
|
self.assertEqual(eval('E()' + sym + 'Decimal(10)'),
|
|
'str' + lop + '10')
|
|
self.assertEqual(eval('Decimal(10)' + sym + 'E()'),
|
|
'10' + rop + 'str')
|
|
|
|
class DecimalArithmeticOperatorsTest(unittest.TestCase):
|
|
'''Unit tests for all arithmetic operators, binary and unary.'''
|
|
|
|
def test_addition(self):
|
|
|
|
d1 = Decimal('-11.1')
|
|
d2 = Decimal('22.2')
|
|
|
|
#two Decimals
|
|
self.assertEqual(d1+d2, Decimal('11.1'))
|
|
self.assertEqual(d2+d1, Decimal('11.1'))
|
|
|
|
#with other type, left
|
|
c = d1 + 5
|
|
self.assertEqual(c, Decimal('-6.1'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#with other type, right
|
|
c = 5 + d1
|
|
self.assertEqual(c, Decimal('-6.1'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#inline with decimal
|
|
d1 += d2
|
|
self.assertEqual(d1, Decimal('11.1'))
|
|
|
|
#inline with other type
|
|
d1 += 5
|
|
self.assertEqual(d1, Decimal('16.1'))
|
|
|
|
def test_subtraction(self):
|
|
|
|
d1 = Decimal('-11.1')
|
|
d2 = Decimal('22.2')
|
|
|
|
#two Decimals
|
|
self.assertEqual(d1-d2, Decimal('-33.3'))
|
|
self.assertEqual(d2-d1, Decimal('33.3'))
|
|
|
|
#with other type, left
|
|
c = d1 - 5
|
|
self.assertEqual(c, Decimal('-16.1'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#with other type, right
|
|
c = 5 - d1
|
|
self.assertEqual(c, Decimal('16.1'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#inline with decimal
|
|
d1 -= d2
|
|
self.assertEqual(d1, Decimal('-33.3'))
|
|
|
|
#inline with other type
|
|
d1 -= 5
|
|
self.assertEqual(d1, Decimal('-38.3'))
|
|
|
|
def test_multiplication(self):
|
|
|
|
d1 = Decimal('-5')
|
|
d2 = Decimal('3')
|
|
|
|
#two Decimals
|
|
self.assertEqual(d1*d2, Decimal('-15'))
|
|
self.assertEqual(d2*d1, Decimal('-15'))
|
|
|
|
#with other type, left
|
|
c = d1 * 5
|
|
self.assertEqual(c, Decimal('-25'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#with other type, right
|
|
c = 5 * d1
|
|
self.assertEqual(c, Decimal('-25'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#inline with decimal
|
|
d1 *= d2
|
|
self.assertEqual(d1, Decimal('-15'))
|
|
|
|
#inline with other type
|
|
d1 *= 5
|
|
self.assertEqual(d1, Decimal('-75'))
|
|
|
|
def test_division(self):
|
|
|
|
d1 = Decimal('-5')
|
|
d2 = Decimal('2')
|
|
|
|
#two Decimals
|
|
self.assertEqual(d1/d2, Decimal('-2.5'))
|
|
self.assertEqual(d2/d1, Decimal('-0.4'))
|
|
|
|
#with other type, left
|
|
c = d1 / 4
|
|
self.assertEqual(c, Decimal('-1.25'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#with other type, right
|
|
c = 4 / d1
|
|
self.assertEqual(c, Decimal('-0.8'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#inline with decimal
|
|
d1 /= d2
|
|
self.assertEqual(d1, Decimal('-2.5'))
|
|
|
|
#inline with other type
|
|
d1 /= 4
|
|
self.assertEqual(d1, Decimal('-0.625'))
|
|
|
|
def test_floor_division(self):
|
|
|
|
d1 = Decimal('5')
|
|
d2 = Decimal('2')
|
|
|
|
#two Decimals
|
|
self.assertEqual(d1//d2, Decimal('2'))
|
|
self.assertEqual(d2//d1, Decimal('0'))
|
|
|
|
#with other type, left
|
|
c = d1 // 4
|
|
self.assertEqual(c, Decimal('1'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#with other type, right
|
|
c = 7 // d1
|
|
self.assertEqual(c, Decimal('1'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#inline with decimal
|
|
d1 //= d2
|
|
self.assertEqual(d1, Decimal('2'))
|
|
|
|
#inline with other type
|
|
d1 //= 2
|
|
self.assertEqual(d1, Decimal('1'))
|
|
|
|
def test_powering(self):
|
|
|
|
d1 = Decimal('5')
|
|
d2 = Decimal('2')
|
|
|
|
#two Decimals
|
|
self.assertEqual(d1**d2, Decimal('25'))
|
|
self.assertEqual(d2**d1, Decimal('32'))
|
|
|
|
#with other type, left
|
|
c = d1 ** 4
|
|
self.assertEqual(c, Decimal('625'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#with other type, right
|
|
c = 7 ** d1
|
|
self.assertEqual(c, Decimal('16807'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#inline with decimal
|
|
d1 **= d2
|
|
self.assertEqual(d1, Decimal('25'))
|
|
|
|
#inline with other type
|
|
d1 **= 4
|
|
self.assertEqual(d1, Decimal('390625'))
|
|
|
|
def test_module(self):
|
|
|
|
d1 = Decimal('5')
|
|
d2 = Decimal('2')
|
|
|
|
#two Decimals
|
|
self.assertEqual(d1%d2, Decimal('1'))
|
|
self.assertEqual(d2%d1, Decimal('2'))
|
|
|
|
#with other type, left
|
|
c = d1 % 4
|
|
self.assertEqual(c, Decimal('1'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#with other type, right
|
|
c = 7 % d1
|
|
self.assertEqual(c, Decimal('2'))
|
|
self.assertEqual(type(c), type(d1))
|
|
|
|
#inline with decimal
|
|
d1 %= d2
|
|
self.assertEqual(d1, Decimal('1'))
|
|
|
|
#inline with other type
|
|
d1 %= 4
|
|
self.assertEqual(d1, Decimal('1'))
|
|
|
|
def test_floor_div_module(self):
|
|
|
|
d1 = Decimal('5')
|
|
d2 = Decimal('2')
|
|
|
|
#two Decimals
|
|
(p, q) = divmod(d1, d2)
|
|
self.assertEqual(p, Decimal('2'))
|
|
self.assertEqual(q, Decimal('1'))
|
|
self.assertEqual(type(p), type(d1))
|
|
self.assertEqual(type(q), type(d1))
|
|
|
|
#with other type, left
|
|
(p, q) = divmod(d1, 4)
|
|
self.assertEqual(p, Decimal('1'))
|
|
self.assertEqual(q, Decimal('1'))
|
|
self.assertEqual(type(p), type(d1))
|
|
self.assertEqual(type(q), type(d1))
|
|
|
|
#with other type, right
|
|
(p, q) = divmod(7, d1)
|
|
self.assertEqual(p, Decimal('1'))
|
|
self.assertEqual(q, Decimal('2'))
|
|
self.assertEqual(type(p), type(d1))
|
|
self.assertEqual(type(q), type(d1))
|
|
|
|
def test_unary_operators(self):
|
|
self.assertEqual(+Decimal(45), Decimal(+45)) # +
|
|
self.assertEqual(-Decimal(45), Decimal(-45)) # -
|
|
self.assertEqual(abs(Decimal(45)), abs(Decimal(-45))) # abs
|
|
|
|
|
|
# The following are two functions used to test threading in the next class
|
|
|
|
def thfunc1(cls):
|
|
d1 = Decimal(1)
|
|
d3 = Decimal(3)
|
|
cls.assertEqual(d1/d3, Decimal('0.333333333'))
|
|
cls.synchro.wait()
|
|
cls.assertEqual(d1/d3, Decimal('0.333333333'))
|
|
cls.finish1.set()
|
|
return
|
|
|
|
def thfunc2(cls):
|
|
d1 = Decimal(1)
|
|
d3 = Decimal(3)
|
|
cls.assertEqual(d1/d3, Decimal('0.333333333'))
|
|
thiscontext = getcontext()
|
|
thiscontext.prec = 18
|
|
cls.assertEqual(d1/d3, Decimal('0.333333333333333333'))
|
|
cls.synchro.set()
|
|
cls.finish2.set()
|
|
return
|
|
|
|
|
|
class DecimalUseOfContextTest(unittest.TestCase):
|
|
'''Unit tests for Use of Context cases in Decimal.'''
|
|
|
|
try:
|
|
import threading
|
|
except ImportError:
|
|
threading = None
|
|
|
|
# Take care executing this test from IDLE, there's an issue in threading
|
|
# that hangs IDLE and I couldn't find it
|
|
|
|
def test_threading(self):
|
|
#Test the "threading isolation" of a Context.
|
|
|
|
self.synchro = threading.Event()
|
|
self.finish1 = threading.Event()
|
|
self.finish2 = threading.Event()
|
|
|
|
th1 = threading.Thread(target=thfunc1, args=(self,))
|
|
th2 = threading.Thread(target=thfunc2, args=(self,))
|
|
|
|
th1.start()
|
|
th2.start()
|
|
|
|
self.finish1.wait()
|
|
self.finish2.wait()
|
|
return
|
|
|
|
if threading is None:
|
|
del test_threading
|
|
|
|
|
|
class DecimalUsabilityTest(unittest.TestCase):
|
|
'''Unit tests for Usability cases of Decimal.'''
|
|
|
|
def test_comparison_operators(self):
|
|
|
|
da = Decimal('23.42')
|
|
db = Decimal('23.42')
|
|
dc = Decimal('45')
|
|
|
|
#two Decimals
|
|
self.failUnless(dc > da)
|
|
self.failUnless(dc >= da)
|
|
self.failUnless(da < dc)
|
|
self.failUnless(da <= dc)
|
|
self.assertEqual(da, db)
|
|
self.failUnless(da != dc)
|
|
self.failUnless(da <= db)
|
|
self.failUnless(da >= db)
|
|
self.assertEqual(cmp(dc,da), 1)
|
|
self.assertEqual(cmp(da,dc), -1)
|
|
self.assertEqual(cmp(da,db), 0)
|
|
|
|
#a Decimal and an int
|
|
self.failUnless(dc > 23)
|
|
self.failUnless(23 < dc)
|
|
self.assertEqual(dc, 45)
|
|
self.assertEqual(cmp(dc,23), 1)
|
|
self.assertEqual(cmp(23,dc), -1)
|
|
self.assertEqual(cmp(dc,45), 0)
|
|
|
|
#a Decimal and uncomparable
|
|
self.assertNotEqual(da, 'ugly')
|
|
self.assertNotEqual(da, 32.7)
|
|
self.assertNotEqual(da, object())
|
|
self.assertNotEqual(da, object)
|
|
|
|
# sortable
|
|
a = list(map(Decimal, range(100)))
|
|
b = a[:]
|
|
random.shuffle(a)
|
|
a.sort()
|
|
self.assertEqual(a, b)
|
|
|
|
def test_copy_and_deepcopy_methods(self):
|
|
d = Decimal('43.24')
|
|
c = copy.copy(d)
|
|
self.assertEqual(id(c), id(d))
|
|
dc = copy.deepcopy(d)
|
|
self.assertEqual(id(dc), id(d))
|
|
|
|
def test_hash_method(self):
|
|
#just that it's hashable
|
|
hash(Decimal(23))
|
|
|
|
test_values = [Decimal(sign*(2**m + n))
|
|
for m in [0, 14, 15, 16, 17, 30, 31,
|
|
32, 33, 62, 63, 64, 65, 66]
|
|
for n in range(-10, 10)
|
|
for sign in [-1, 1]]
|
|
test_values.extend([
|
|
Decimal("-0"), # zeros
|
|
Decimal("0.00"),
|
|
Decimal("-0.000"),
|
|
Decimal("0E10"),
|
|
Decimal("-0E12"),
|
|
Decimal("10.0"), # negative exponent
|
|
Decimal("-23.00000"),
|
|
Decimal("1230E100"), # positive exponent
|
|
Decimal("-4.5678E50"),
|
|
# a value for which hash(n) != hash(n % (2**64-1))
|
|
# in Python pre-2.6
|
|
Decimal(2**64 + 2**32 - 1),
|
|
# selection of values which fail with the old (before
|
|
# version 2.6) long.__hash__
|
|
Decimal("1.634E100"),
|
|
Decimal("90.697E100"),
|
|
Decimal("188.83E100"),
|
|
Decimal("1652.9E100"),
|
|
Decimal("56531E100"),
|
|
])
|
|
|
|
# check that hash(d) == hash(int(d)) for integral values
|
|
for value in test_values:
|
|
self.assertEqual(hash(value), hash(int(value)))
|
|
|
|
#the same hash that to an int
|
|
self.assertEqual(hash(Decimal(23)), hash(23))
|
|
self.assertRaises(TypeError, hash, Decimal('NaN'))
|
|
self.assert_(hash(Decimal('Inf')))
|
|
self.assert_(hash(Decimal('-Inf')))
|
|
|
|
def test_min_and_max_methods(self):
|
|
|
|
d1 = Decimal('15.32')
|
|
d2 = Decimal('28.5')
|
|
l1 = 15
|
|
l2 = 28
|
|
|
|
#between Decimals
|
|
self.failUnless(min(d1,d2) is d1)
|
|
self.failUnless(min(d2,d1) is d1)
|
|
self.failUnless(max(d1,d2) is d2)
|
|
self.failUnless(max(d2,d1) is d2)
|
|
|
|
#between Decimal and long
|
|
self.failUnless(min(d1,l2) is d1)
|
|
self.failUnless(min(l2,d1) is d1)
|
|
self.failUnless(max(l1,d2) is d2)
|
|
self.failUnless(max(d2,l1) is d2)
|
|
|
|
def test_as_nonzero(self):
|
|
#as false
|
|
self.failIf(Decimal(0))
|
|
#as true
|
|
self.failUnless(Decimal('0.372'))
|
|
|
|
def test_tostring_methods(self):
|
|
#Test str and repr methods.
|
|
|
|
d = Decimal('15.32')
|
|
self.assertEqual(str(d), '15.32') # str
|
|
self.assertEqual(repr(d), 'Decimal("15.32")') # repr
|
|
|
|
def test_tonum_methods(self):
|
|
#Test float, int and long methods.
|
|
|
|
d1 = Decimal('66')
|
|
d2 = Decimal('15.32')
|
|
|
|
#int
|
|
self.assertEqual(int(d1), 66)
|
|
self.assertEqual(int(d2), 15)
|
|
|
|
#long
|
|
self.assertEqual(int(d1), 66)
|
|
self.assertEqual(int(d2), 15)
|
|
|
|
#float
|
|
self.assertEqual(float(d1), 66)
|
|
self.assertEqual(float(d2), 15.32)
|
|
|
|
def test_eval_round_trip(self):
|
|
|
|
#with zero
|
|
d = Decimal( (0, (0,), 0) )
|
|
self.assertEqual(d, eval(repr(d)))
|
|
|
|
#int
|
|
d = Decimal( (1, (4, 5), 0) )
|
|
self.assertEqual(d, eval(repr(d)))
|
|
|
|
#float
|
|
d = Decimal( (0, (4, 5, 3, 4), -2) )
|
|
self.assertEqual(d, eval(repr(d)))
|
|
|
|
#weird
|
|
d = Decimal( (1, (4, 3, 4, 9, 1, 3, 5, 3, 4), -25) )
|
|
self.assertEqual(d, eval(repr(d)))
|
|
|
|
def test_as_tuple(self):
|
|
|
|
#with zero
|
|
d = Decimal(0)
|
|
self.assertEqual(d.as_tuple(), (0, (0,), 0) )
|
|
|
|
#int
|
|
d = Decimal(-45)
|
|
self.assertEqual(d.as_tuple(), (1, (4, 5), 0) )
|
|
|
|
#complicated string
|
|
d = Decimal("-4.34913534E-17")
|
|
self.assertEqual(d.as_tuple(), (1, (4, 3, 4, 9, 1, 3, 5, 3, 4), -25) )
|
|
|
|
#inf
|
|
d = Decimal("Infinity")
|
|
self.assertEqual(d.as_tuple(), (0, (0,), 'F') )
|
|
|
|
#leading zeros in coefficient should be stripped
|
|
d = Decimal( (0, (0, 0, 4, 0, 5, 3, 4), -2) )
|
|
self.assertEqual(d.as_tuple(), (0, (4, 0, 5, 3, 4), -2) )
|
|
d = Decimal( (1, (0, 0, 0), 37) )
|
|
self.assertEqual(d.as_tuple(), (1, (0,), 37))
|
|
d = Decimal( (1, (), 37) )
|
|
self.assertEqual(d.as_tuple(), (1, (0,), 37))
|
|
|
|
#leading zeros in NaN diagnostic info should be stripped
|
|
d = Decimal( (0, (0, 0, 4, 0, 5, 3, 4), 'n') )
|
|
self.assertEqual(d.as_tuple(), (0, (4, 0, 5, 3, 4), 'n') )
|
|
d = Decimal( (1, (0, 0, 0), 'N') )
|
|
self.assertEqual(d.as_tuple(), (1, (), 'N') )
|
|
d = Decimal( (1, (), 'n') )
|
|
self.assertEqual(d.as_tuple(), (1, (), 'n') )
|
|
|
|
#coefficient in infinity should be ignored
|
|
d = Decimal( (0, (4, 5, 3, 4), 'F') )
|
|
self.assertEqual(d.as_tuple(), (0, (0,), 'F'))
|
|
d = Decimal( (1, (0, 2, 7, 1), 'F') )
|
|
self.assertEqual(d.as_tuple(), (1, (0,), 'F'))
|
|
|
|
def test_immutability_operations(self):
|
|
# Do operations and check that it didn't change change internal objects.
|
|
|
|
d1 = Decimal('-25e55')
|
|
b1 = Decimal('-25e55')
|
|
d2 = Decimal('33e+33')
|
|
b2 = Decimal('33e+33')
|
|
|
|
def checkSameDec(operation, useOther=False):
|
|
if useOther:
|
|
eval("d1." + operation + "(d2)")
|
|
self.assertEqual(d1._sign, b1._sign)
|
|
self.assertEqual(d1._int, b1._int)
|
|
self.assertEqual(d1._exp, b1._exp)
|
|
self.assertEqual(d2._sign, b2._sign)
|
|
self.assertEqual(d2._int, b2._int)
|
|
self.assertEqual(d2._exp, b2._exp)
|
|
else:
|
|
eval("d1." + operation + "()")
|
|
self.assertEqual(d1._sign, b1._sign)
|
|
self.assertEqual(d1._int, b1._int)
|
|
self.assertEqual(d1._exp, b1._exp)
|
|
return
|
|
|
|
Decimal(d1)
|
|
self.assertEqual(d1._sign, b1._sign)
|
|
self.assertEqual(d1._int, b1._int)
|
|
self.assertEqual(d1._exp, b1._exp)
|
|
|
|
checkSameDec("__abs__")
|
|
checkSameDec("__add__", True)
|
|
checkSameDec("__divmod__", True)
|
|
checkSameDec("__cmp__", True)
|
|
checkSameDec("__float__")
|
|
checkSameDec("__floordiv__", True)
|
|
checkSameDec("__hash__")
|
|
checkSameDec("__int__")
|
|
checkSameDec("__mod__", True)
|
|
checkSameDec("__mul__", True)
|
|
checkSameDec("__neg__")
|
|
checkSameDec("__bool__")
|
|
checkSameDec("__pos__")
|
|
checkSameDec("__pow__", True)
|
|
checkSameDec("__radd__", True)
|
|
checkSameDec("__rdivmod__", True)
|
|
checkSameDec("__repr__")
|
|
checkSameDec("__rfloordiv__", True)
|
|
checkSameDec("__rmod__", True)
|
|
checkSameDec("__rmul__", True)
|
|
checkSameDec("__rpow__", True)
|
|
checkSameDec("__rsub__", True)
|
|
checkSameDec("__str__")
|
|
checkSameDec("__sub__", True)
|
|
checkSameDec("__truediv__", True)
|
|
checkSameDec("adjusted")
|
|
checkSameDec("as_tuple")
|
|
checkSameDec("compare", True)
|
|
checkSameDec("max", True)
|
|
checkSameDec("min", True)
|
|
checkSameDec("normalize")
|
|
checkSameDec("quantize", True)
|
|
checkSameDec("remainder_near", True)
|
|
checkSameDec("same_quantum", True)
|
|
checkSameDec("sqrt")
|
|
checkSameDec("to_eng_string")
|
|
checkSameDec("to_integral")
|
|
|
|
def test_subclassing(self):
|
|
# Different behaviours when subclassing Decimal
|
|
|
|
class MyDecimal(Decimal):
|
|
pass
|
|
|
|
d1 = MyDecimal(1)
|
|
d2 = MyDecimal(2)
|
|
d = d1 + d2
|
|
self.assertTrue(type(d) is Decimal)
|
|
|
|
d = d1.max(d2)
|
|
self.assertTrue(type(d) is Decimal)
|
|
|
|
|
|
class DecimalPythonAPItests(unittest.TestCase):
|
|
|
|
def test_pickle(self):
|
|
d = Decimal('-3.141590000')
|
|
p = pickle.dumps(d)
|
|
e = pickle.loads(p)
|
|
self.assertEqual(d, e)
|
|
|
|
def test_int(self):
|
|
for x in range(-250, 250):
|
|
s = '%0.2f' % (x / 100.0)
|
|
# should work the same as for floats
|
|
self.assertEqual(int(Decimal(s)), int(float(s)))
|
|
# should work the same as to_integral in the ROUND_DOWN mode
|
|
d = Decimal(s)
|
|
r = d.to_integral(ROUND_DOWN)
|
|
self.assertEqual(Decimal(int(d)), r)
|
|
|
|
class ContextAPItests(unittest.TestCase):
|
|
|
|
def test_pickle(self):
|
|
c = Context()
|
|
e = pickle.loads(pickle.dumps(c))
|
|
for k in vars(c):
|
|
v1 = vars(c)[k]
|
|
v2 = vars(e)[k]
|
|
self.assertEqual(v1, v2)
|
|
|
|
def test_equality_with_other_types(self):
|
|
self.assert_(Decimal(10) in ['a', 1.0, Decimal(10), (1,2), {}])
|
|
self.assert_(Decimal(10) not in ['a', 1.0, (1,2), {}])
|
|
|
|
def test_copy(self):
|
|
# All copies should be deep
|
|
c = Context()
|
|
d = c.copy()
|
|
self.assertNotEqual(id(c), id(d))
|
|
self.assertNotEqual(id(c.flags), id(d.flags))
|
|
self.assertNotEqual(id(c.traps), id(d.traps))
|
|
|
|
class WithStatementTest(unittest.TestCase):
|
|
# Can't do these as docstrings until Python 2.6
|
|
# as doctest can't handle __future__ statements
|
|
|
|
def test_localcontext(self):
|
|
# Use a copy of the current context in the block
|
|
orig_ctx = getcontext()
|
|
with localcontext() as enter_ctx:
|
|
set_ctx = getcontext()
|
|
final_ctx = getcontext()
|
|
self.assert_(orig_ctx is final_ctx, 'did not restore context correctly')
|
|
self.assert_(orig_ctx is not set_ctx, 'did not copy the context')
|
|
self.assert_(set_ctx is enter_ctx, '__enter__ returned wrong context')
|
|
|
|
def test_localcontextarg(self):
|
|
# Use a copy of the supplied context in the block
|
|
orig_ctx = getcontext()
|
|
new_ctx = Context(prec=42)
|
|
with localcontext(new_ctx) as enter_ctx:
|
|
set_ctx = getcontext()
|
|
final_ctx = getcontext()
|
|
self.assert_(orig_ctx is final_ctx, 'did not restore context correctly')
|
|
self.assert_(set_ctx.prec == new_ctx.prec, 'did not set correct context')
|
|
self.assert_(new_ctx is not set_ctx, 'did not copy the context')
|
|
self.assert_(set_ctx is enter_ctx, '__enter__ returned wrong context')
|
|
|
|
class ContextFlags(unittest.TestCase):
|
|
def test_flags_irrelevant(self):
|
|
# check that the result (numeric result + flags raised) of an
|
|
# arithmetic operation doesn't depend on the current flags
|
|
|
|
context = Context(prec=9, Emin = -999999999, Emax = 999999999,
|
|
rounding=ROUND_HALF_EVEN, traps=[], flags=[])
|
|
|
|
# operations that raise various flags, in the form (function, arglist)
|
|
operations = [
|
|
(context._apply, [Decimal("100E-1000000009")]),
|
|
(context.sqrt, [Decimal(2)]),
|
|
(context.add, [Decimal("1.23456789"), Decimal("9.87654321")]),
|
|
(context.multiply, [Decimal("1.23456789"), Decimal("9.87654321")]),
|
|
(context.subtract, [Decimal("1.23456789"), Decimal("9.87654321")]),
|
|
]
|
|
|
|
# try various flags individually, then a whole lot at once
|
|
flagsets = [[Inexact], [Rounded], [Underflow], [Clamped], [Subnormal],
|
|
[Inexact, Rounded, Underflow, Clamped, Subnormal]]
|
|
|
|
for fn, args in operations:
|
|
# find answer and flags raised using a clean context
|
|
context.clear_flags()
|
|
ans = fn(*args)
|
|
flags = [k for k, v in context.flags.items() if v]
|
|
|
|
for extra_flags in flagsets:
|
|
# set flags, before calling operation
|
|
context.clear_flags()
|
|
for flag in extra_flags:
|
|
context._raise_error(flag)
|
|
new_ans = fn(*args)
|
|
|
|
# flags that we expect to be set after the operation
|
|
expected_flags = list(flags)
|
|
for flag in extra_flags:
|
|
if flag not in expected_flags:
|
|
expected_flags.append(flag)
|
|
expected_flags.sort(key=id)
|
|
|
|
# flags we actually got
|
|
new_flags = [k for k,v in context.flags.items() if v]
|
|
new_flags.sort(key=id)
|
|
|
|
self.assertEqual(ans, new_ans,
|
|
"operation produces different answers depending on flags set: " +
|
|
"expected %s, got %s." % (ans, new_ans))
|
|
self.assertEqual(new_flags, expected_flags,
|
|
"operation raises different flags depending on flags set: " +
|
|
"expected %s, got %s" % (expected_flags, new_flags))
|
|
|
|
def test_main(arith=False, verbose=None, todo_tests=None, debug=None):
|
|
""" Execute the tests.
|
|
|
|
Runs all arithmetic tests if arith is True or if the "decimal" resource
|
|
is enabled in regrtest.py
|
|
"""
|
|
|
|
init()
|
|
global TEST_ALL, DEBUG
|
|
TEST_ALL = arith or is_resource_enabled('decimal')
|
|
DEBUG = debug
|
|
|
|
if todo_tests is None:
|
|
test_classes = [
|
|
DecimalExplicitConstructionTest,
|
|
DecimalImplicitConstructionTest,
|
|
DecimalArithmeticOperatorsTest,
|
|
DecimalUseOfContextTest,
|
|
DecimalUsabilityTest,
|
|
DecimalPythonAPItests,
|
|
ContextAPItests,
|
|
DecimalTest,
|
|
WithStatementTest,
|
|
ContextFlags
|
|
]
|
|
else:
|
|
test_classes = [DecimalTest]
|
|
|
|
# Dynamically build custom test definition for each file in the test
|
|
# directory and add the definitions to the DecimalTest class. This
|
|
# procedure insures that new files do not get skipped.
|
|
for filename in os.listdir(directory):
|
|
if '.decTest' not in filename or filename.startswith("."):
|
|
continue
|
|
head, tail = filename.split('.')
|
|
if todo_tests is not None and head not in todo_tests:
|
|
continue
|
|
tester = lambda self, f=filename: self.eval_file(directory + f)
|
|
setattr(DecimalTest, 'test_' + head, tester)
|
|
del filename, head, tail, tester
|
|
|
|
|
|
try:
|
|
run_unittest(*test_classes)
|
|
if todo_tests is None:
|
|
import decimal as DecimalModule
|
|
run_doctest(DecimalModule, verbose)
|
|
finally:
|
|
setcontext(ORIGINAL_CONTEXT)
|
|
|
|
if __name__ == '__main__':
|
|
import optparse
|
|
p = optparse.OptionParser("test_decimal.py [--debug] [{--skip | test1 [test2 [...]]}]")
|
|
p.add_option('--debug', '-d', action='store_true', help='shows the test number and context before each test')
|
|
p.add_option('--skip', '-s', action='store_true', help='skip over 90% of the arithmetic tests')
|
|
(opt, args) = p.parse_args()
|
|
|
|
if opt.skip:
|
|
test_main(arith=False, verbose=True)
|
|
elif args:
|
|
test_main(arith=True, verbose=True, todo_tests=args, debug=opt.debug)
|
|
else:
|
|
test_main(arith=True, verbose=True)
|