mirror of
https://github.com/python/cpython
synced 2024-09-18 22:11:39 +00:00
89f507fe8c
Merged revisions 51434-53004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51434 | neal.norwitz | 2006-08-21 20:20:10 +0200 (Mon, 21 Aug 2006) | 1 line Fix a couple of ssize-t issues reported by Alexander Belopolsky on python-dev ........ r51439 | neal.norwitz | 2006-08-21 21:47:08 +0200 (Mon, 21 Aug 2006) | 6 lines Patch #1542451: disallow continue anywhere under a finally I'm undecided if this should be backported to 2.5 or 2.5.1. Armin suggested to wait (I'm of the same opinion). Thomas W thinks it's fine to go in 2.5. ........ r51443 | neal.norwitz | 2006-08-21 22:16:24 +0200 (Mon, 21 Aug 2006) | 4 lines Handle a few more error conditions. Klocwork 301 and 302. Will backport. ........ r51450 | neal.norwitz | 2006-08-22 00:21:19 +0200 (Tue, 22 Aug 2006) | 5 lines Patch #1541585: fix buffer overrun when performing repr() on a unicode string in a build with wide unicode (UCS-4) support. This code could be improved, so add an XXX comment. ........ r51456 | neal.norwitz | 2006-08-22 01:44:48 +0200 (Tue, 22 Aug 2006) | 1 line Try to get the windows bots working again with the new peephole.c ........ r51461 | anthony.baxter | 2006-08-22 09:36:59 +0200 (Tue, 22 Aug 2006) | 1 line patch for documentation for recent uuid changes (from ping) ........ r51473 | neal.norwitz | 2006-08-22 15:56:56 +0200 (Tue, 22 Aug 2006) | 1 line Alexander Belopolsky pointed out that pos is a size_t ........ r51489 | jeremy.hylton | 2006-08-22 22:46:00 +0200 (Tue, 22 Aug 2006) | 2 lines Expose column offset information in parse trees. ........ r51497 | andrew.kuchling | 2006-08-23 01:13:43 +0200 (Wed, 23 Aug 2006) | 1 line Move functional howto into trunk ........ r51515 | jeremy.hylton | 2006-08-23 20:37:43 +0200 (Wed, 23 Aug 2006) | 2 lines Baby steps towards better tests for tokenize ........ r51525 | alex.martelli | 2006-08-23 22:42:02 +0200 (Wed, 23 Aug 2006) | 6 lines x**2 should about equal x*x (including for a float x such that the result is inf) but didn't; added a test to test_float to verify that, and ignored the ERANGE value for errno in the pow operation to make the new test pass (with help from Marilyn Davis at the Google Python Sprint -- thanks!). ........ r51526 | jeremy.hylton | 2006-08-23 23:14:03 +0200 (Wed, 23 Aug 2006) | 20 lines Bug fixes large and small for tokenize. Small: Always generate a NL or NEWLINE token following a COMMENT token. The old code did not generate an NL token if the comment was on a line by itself. Large: The output of untokenize() will now match the input exactly if it is passed the full token sequence. The old, crufty output is still generated if a limited input sequence is provided, where limited means that it does not include position information for tokens. Remaining bug: There is no CONTINUATION token (\) so there is no way for untokenize() to handle such code. Also, expanded the number of doctests in hopes of eventually removing the old-style tests that compare against a golden file. Bug fix candidate for Python 2.5.1. (Sigh.) ........ r51527 | jeremy.hylton | 2006-08-23 23:26:46 +0200 (Wed, 23 Aug 2006) | 5 lines Replace dead code with an assert. Now that COMMENT tokens are reliably followed by NL or NEWLINE, there is never a need to add extra newlines in untokenize. ........ r51530 | alex.martelli | 2006-08-24 00:17:59 +0200 (Thu, 24 Aug 2006) | 7 lines Reverting the patch that tried to fix the issue whereby x**2 raises OverflowError while x*x succeeds and produces infinity; apparently these inconsistencies cannot be fixed across ``all'' platforms and there's a widespread feeling that therefore ``every'' platform should keep suffering forevermore. Ah well. ........ r51565 | thomas.wouters | 2006-08-24 20:40:20 +0200 (Thu, 24 Aug 2006) | 6 lines Fix SF bug #1545837: array.array borks on deepcopy. array.__deepcopy__() needs to take an argument, even if it doesn't actually use it. Will backport to 2.5 and 2.4 (if applicable.) ........ r51580 | martin.v.loewis | 2006-08-25 02:03:34 +0200 (Fri, 25 Aug 2006) | 3 lines Patch #1545507: Exclude ctypes package in Win64 MSI file. Will backport to 2.5. ........ r51589 | neal.norwitz | 2006-08-25 03:52:49 +0200 (Fri, 25 Aug 2006) | 1 line importing types is not necessary if we use isinstance ........ r51604 | thomas.heller | 2006-08-25 09:27:33 +0200 (Fri, 25 Aug 2006) | 3 lines Port _ctypes.pyd to win64 on AMD64. ........ r51605 | thomas.heller | 2006-08-25 09:34:51 +0200 (Fri, 25 Aug 2006) | 3 lines Add missing file for _ctypes.pyd port to win64 on AMD64. ........ r51606 | thomas.heller | 2006-08-25 11:26:33 +0200 (Fri, 25 Aug 2006) | 6 lines Build _ctypes.pyd for win AMD64 into the MSVC project file. Since MSVC doesn't know about .asm files, a helper batch file is needed to find ml64.exe in predefined locations. The helper script hardcodes the path to the MS Platform SDK. ........ r51608 | armin.rigo | 2006-08-25 14:44:28 +0200 (Fri, 25 Aug 2006) | 4 lines The regular expression engine in '_sre' can segfault when interpreting bogus bytecode. It is unclear whether this is a real bug or a "won't fix" case like bogus_code_obj.py. ........ r51617 | tim.peters | 2006-08-26 00:05:39 +0200 (Sat, 26 Aug 2006) | 2 lines Whitespace normalization. ........ r51618 | tim.peters | 2006-08-26 00:06:44 +0200 (Sat, 26 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51619 | tim.peters | 2006-08-26 00:26:21 +0200 (Sat, 26 Aug 2006) | 3 lines A new test here relied on preserving invisible trailing whitespace in expected output. Stop that. ........ r51624 | jack.diederich | 2006-08-26 20:42:06 +0200 (Sat, 26 Aug 2006) | 4 lines - Move functions common to all path modules into genericpath.py and have the OS speicifc path modules import them. - Have os2emxpath import common functions fron ntpath instead of using copies ........ r51642 | neal.norwitz | 2006-08-29 07:40:58 +0200 (Tue, 29 Aug 2006) | 1 line Fix a couple of typos. ........ r51647 | marc-andre.lemburg | 2006-08-29 12:34:12 +0200 (Tue, 29 Aug 2006) | 5 lines Fix a buglet in the error reporting (SF bug report #1546372). This should probably go into Python 2.5 or 2.5.1 as well. ........ r51663 | armin.rigo | 2006-08-31 10:51:06 +0200 (Thu, 31 Aug 2006) | 3 lines Doc fix: hashlib objects don't always return a digest of 16 bytes. Backport candidate for 2.5. ........ r51664 | nick.coghlan | 2006-08-31 14:00:43 +0200 (Thu, 31 Aug 2006) | 1 line Fix the wrongheaded implementation of context management in the decimal module and add unit tests. (python-dev discussion is ongoing regarding what we do about Python 2.5) ........ r51665 | nick.coghlan | 2006-08-31 14:51:25 +0200 (Thu, 31 Aug 2006) | 1 line Remove the old decimal context management tests from test_contextlib (guess who didn't run the test suite before committing...) ........ r51669 | brett.cannon | 2006-08-31 20:54:26 +0200 (Thu, 31 Aug 2006) | 4 lines Make sure memory is properly cleaned up in file_init. Backport candidate. ........ r51671 | brett.cannon | 2006-08-31 23:47:52 +0200 (Thu, 31 Aug 2006) | 2 lines Fix comment about indentation level in C files. ........ r51674 | brett.cannon | 2006-09-01 00:42:37 +0200 (Fri, 01 Sep 2006) | 3 lines Have pre-existing C files use 8 spaces indents (to match old PEP 7 style), but have all new files use 4 spaces (to match current PEP 7 style). ........ r51676 | fred.drake | 2006-09-01 05:57:19 +0200 (Fri, 01 Sep 2006) | 3 lines - SF patch #1550263: Enhance and correct unittest docs - various minor cleanups for improved consistency ........ r51677 | georg.brandl | 2006-09-02 00:30:52 +0200 (Sat, 02 Sep 2006) | 2 lines evalfile() should be execfile(). ........ r51681 | neal.norwitz | 2006-09-02 04:43:17 +0200 (Sat, 02 Sep 2006) | 1 line SF #1547931, fix typo (missing and). Will backport to 2.5 ........ r51683 | neal.norwitz | 2006-09-02 04:50:35 +0200 (Sat, 02 Sep 2006) | 1 line Bug #1548092: fix curses.tparm seg fault on invalid input. Needs backport to 2.5.1 and earlier. ........ r51684 | neal.norwitz | 2006-09-02 04:58:13 +0200 (Sat, 02 Sep 2006) | 4 lines Bug #1550714: fix SystemError from itertools.tee on negative value for n. Needs backport to 2.5.1 and earlier. ........ r51685 | nick.coghlan | 2006-09-02 05:54:17 +0200 (Sat, 02 Sep 2006) | 1 line Make decimal.ContextManager a private implementation detail of decimal.localcontext() ........ r51686 | nick.coghlan | 2006-09-02 06:04:18 +0200 (Sat, 02 Sep 2006) | 1 line Further corrections to the decimal module context management documentation ........ r51688 | raymond.hettinger | 2006-09-02 19:07:23 +0200 (Sat, 02 Sep 2006) | 1 line Fix documentation nits for decimal context managers. ........ r51690 | neal.norwitz | 2006-09-02 20:51:34 +0200 (Sat, 02 Sep 2006) | 1 line Add missing word in comment ........ r51691 | neal.norwitz | 2006-09-02 21:40:19 +0200 (Sat, 02 Sep 2006) | 7 lines Hmm, this test has failed at least twice recently on the OpenBSD and Debian sparc buildbots. Since this goes through a lot of tests and hits the disk a lot it could be slow (especially if NFS is involved). I'm not sure if that's the problem, but printing periodic msgs shouldn't hurt. The code was stolen from test_compiler. ........ r51693 | nick.coghlan | 2006-09-03 03:02:00 +0200 (Sun, 03 Sep 2006) | 1 line Fix final documentation nits before backporting decimal module fixes to 2.5 ........ r51694 | nick.coghlan | 2006-09-03 03:06:07 +0200 (Sun, 03 Sep 2006) | 1 line Typo fix for decimal docs ........ r51697 | nick.coghlan | 2006-09-03 03:20:46 +0200 (Sun, 03 Sep 2006) | 1 line NEWS entry on trunk for decimal module changes ........ r51704 | raymond.hettinger | 2006-09-04 17:32:48 +0200 (Mon, 04 Sep 2006) | 1 line Fix endcase for str.rpartition() ........ r51716 | tim.peters | 2006-09-05 04:18:09 +0200 (Tue, 05 Sep 2006) | 12 lines "Conceptual" merge of rev 51711 from the 2.5 branch. i_divmod(): As discussed on Python-Dev, changed the overflow checking to live happily with recent gcc optimizations that assume signed integer arithmetic never overflows. This differs from the corresponding change on the 2.5 and 2.4 branches, using a less obscure approach, but one that /may/ tickle platform idiocies in their definitions of LONG_MIN. The 2.4 + 2.5 change avoided introducing a dependence on LONG_MIN, at the cost of substantially goofier code. ........ r51717 | tim.peters | 2006-09-05 04:21:19 +0200 (Tue, 05 Sep 2006) | 2 lines Whitespace normalization. ........ r51719 | tim.peters | 2006-09-05 04:22:17 +0200 (Tue, 05 Sep 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51720 | neal.norwitz | 2006-09-05 04:24:03 +0200 (Tue, 05 Sep 2006) | 2 lines Fix SF bug #1546288, crash in dict_equal. ........ r51721 | neal.norwitz | 2006-09-05 04:25:41 +0200 (Tue, 05 Sep 2006) | 1 line Fix SF #1552093, eval docstring typo (3 ps in mapping) ........ r51724 | neal.norwitz | 2006-09-05 04:35:08 +0200 (Tue, 05 Sep 2006) | 1 line This was found by Guido AFAIK on p3yk (sic) branch. ........ r51725 | neal.norwitz | 2006-09-05 04:36:20 +0200 (Tue, 05 Sep 2006) | 1 line Add a NEWS entry for str.rpartition() change ........ r51728 | neal.norwitz | 2006-09-05 04:57:01 +0200 (Tue, 05 Sep 2006) | 1 line Patch #1540470, for OpenBSD 4.0. Backport candidate for 2.[34]. ........ r51729 | neal.norwitz | 2006-09-05 05:53:08 +0200 (Tue, 05 Sep 2006) | 12 lines Bug #1520864 (again): unpacking singleton tuples in list comprehensions and generator expressions (x for x, in ... ) works again. Sigh, I only fixed for loops the first time, not list comps and genexprs too. I couldn't find any more unpacking cases where there is a similar bug lurking. This code should be refactored to eliminate the duplication. I'm sure the listcomp/genexpr code can be refactored. I'm not sure if the for loop can re-use any of the same code though. Will backport to 2.5 (the only place it matters). ........ r51731 | neal.norwitz | 2006-09-05 05:58:26 +0200 (Tue, 05 Sep 2006) | 1 line Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. ........ r51732 | neal.norwitz | 2006-09-05 06:00:12 +0200 (Tue, 05 Sep 2006) | 1 line M-x untabify ........ r51737 | hyeshik.chang | 2006-09-05 14:07:09 +0200 (Tue, 05 Sep 2006) | 7 lines Fix a few bugs on cjkcodecs found by Oren Tirosh: - gbk and gb18030 codec now handle U+30FB KATAKANA MIDDLE DOT correctly. - iso2022_jp_2 codec now encodes into G0 for KS X 1001, GB2312 codepoints to conform the standard. - iso2022_jp_3 and iso2022_jp_2004 codec can encode JIS X 2013:2 codepoints now. ........ r51738 | hyeshik.chang | 2006-09-05 14:14:57 +0200 (Tue, 05 Sep 2006) | 2 lines Fix a typo: 2013 -> 0213 ........ r51740 | georg.brandl | 2006-09-05 14:44:58 +0200 (Tue, 05 Sep 2006) | 3 lines Bug #1552618: change docs of dict.has_key() to reflect recommendation to use "in". ........ r51742 | andrew.kuchling | 2006-09-05 15:02:40 +0200 (Tue, 05 Sep 2006) | 1 line Rearrange example a bit, and show rpartition() when separator is not found ........ r51744 | andrew.kuchling | 2006-09-05 15:15:41 +0200 (Tue, 05 Sep 2006) | 1 line [Bug #1525469] SimpleXMLRPCServer still uses the sys.exc_{value,type} module-level globals instead of calling sys.exc_info(). Reported by Russell Warren ........ r51745 | andrew.kuchling | 2006-09-05 15:19:18 +0200 (Tue, 05 Sep 2006) | 3 lines [Bug #1526834] Fix crash in pdb when you do 'b f('; the function name was placed into a regex pattern and the unbalanced paren caused re.compile() to report an error ........ r51751 | kristjan.jonsson | 2006-09-05 19:58:12 +0200 (Tue, 05 Sep 2006) | 6 lines Update the PCBuild8 solution. Facilitate cross-compilation by having binaries in separate Win32 and x64 directories. Rationalized configs by making proper use of platforms/configurations. Remove pythoncore_pgo project. Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation. Removed I64 support, but this can be easily added by copying the x64 platform settings. ........ r51758 | gustavo.niemeyer | 2006-09-06 03:58:52 +0200 (Wed, 06 Sep 2006) | 3 lines Fixing #1531862: Do not close standard file descriptors in the subprocess module. ........ r51760 | neal.norwitz | 2006-09-06 05:58:34 +0200 (Wed, 06 Sep 2006) | 1 line Revert 51758 because it broke all the buildbots ........ r51762 | georg.brandl | 2006-09-06 08:03:59 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1551427: fix a wrong NULL pointer check in the win32 version of os.urandom(). ........ r51765 | georg.brandl | 2006-09-06 08:09:31 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1550983: emit better error messages for erroneous relative imports (if not in package and if beyond toplevel package). ........ r51767 | neal.norwitz | 2006-09-06 08:28:06 +0200 (Wed, 06 Sep 2006) | 1 line with and as are now keywords. There are some generated files I can't recreate. ........ r51770 | georg.brandl | 2006-09-06 08:50:05 +0200 (Wed, 06 Sep 2006) | 5 lines Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack. Also make sure that every exception class has __module__ set to 'exceptions'. ........ r51785 | georg.brandl | 2006-09-06 22:05:58 +0200 (Wed, 06 Sep 2006) | 2 lines Fix missing import of the types module in logging.config. ........ r51789 | marc-andre.lemburg | 2006-09-06 22:40:22 +0200 (Wed, 06 Sep 2006) | 3 lines Add news item for bug fix of SF bug report #1546372. ........ r51797 | gustavo.niemeyer | 2006-09-07 02:48:33 +0200 (Thu, 07 Sep 2006) | 3 lines Fixed subprocess bug #1531862 again, after removing tests offending buildbot ........ r51798 | raymond.hettinger | 2006-09-07 04:42:48 +0200 (Thu, 07 Sep 2006) | 1 line Fix refcounts and add error checks. ........ r51803 | nick.coghlan | 2006-09-07 12:50:34 +0200 (Thu, 07 Sep 2006) | 1 line Fix the speed regression in inspect.py by adding another cache to speed up getmodule(). Patch #1553314 ........ r51805 | ronald.oussoren | 2006-09-07 14:03:10 +0200 (Thu, 07 Sep 2006) | 2 lines Fix a glaring error and update some version numbers. ........ r51814 | andrew.kuchling | 2006-09-07 15:56:23 +0200 (Thu, 07 Sep 2006) | 1 line Typo fix ........ r51815 | andrew.kuchling | 2006-09-07 15:59:38 +0200 (Thu, 07 Sep 2006) | 8 lines [Bug #1552726] Avoid repeatedly polling in interactive mode -- only put a timeout on the select() if an input hook has been defined. Patch by Richard Boulton. This select() code is only executed with readline 2.1, or if READLINE_CALLBACKS is defined. Backport candidate for 2.5, 2.4, probably earlier versions too. ........ r51816 | armin.rigo | 2006-09-07 17:06:00 +0200 (Thu, 07 Sep 2006) | 2 lines Add a warning notice on top of the generated grammar.txt. ........ r51819 | thomas.heller | 2006-09-07 20:56:28 +0200 (Thu, 07 Sep 2006) | 5 lines Anonymous structure fields that have a bit-width specified did not work, and they gave a strange error message from PyArg_ParseTuple: function takes exactly 2 arguments (3 given). With tests. ........ r51820 | thomas.heller | 2006-09-07 21:09:54 +0200 (Thu, 07 Sep 2006) | 4 lines The cast function did not accept c_char_p or c_wchar_p instances as first argument, and failed with a 'bad argument to internal function' error message. ........ r51827 | nick.coghlan | 2006-09-08 12:04:38 +0200 (Fri, 08 Sep 2006) | 1 line Add missing NEWS entry for rev 51803 ........ r51828 | andrew.kuchling | 2006-09-08 15:25:23 +0200 (Fri, 08 Sep 2006) | 1 line Add missing word ........ r51829 | andrew.kuchling | 2006-09-08 15:35:49 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51830 | andrew.kuchling | 2006-09-08 15:36:36 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51832 | andrew.kuchling | 2006-09-08 16:02:45 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51833 | andrew.kuchling | 2006-09-08 16:03:01 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51835 | andrew.kuchling | 2006-09-08 16:05:10 +0200 (Fri, 08 Sep 2006) | 1 line Fix typo in example ........ r51837 | brett.cannon | 2006-09-09 09:11:46 +0200 (Sat, 09 Sep 2006) | 6 lines Remove the __unicode__ method from exceptions. Allows unicode() to be called on exception classes. Would require introducing a tp_unicode slot to make it work otherwise. Fixes bug #1551432 and will be backported. ........ r51854 | neal.norwitz | 2006-09-11 06:24:09 +0200 (Mon, 11 Sep 2006) | 8 lines Forward port of 51850 from release25-maint branch. As mentioned on python-dev, reverting patch #1504333 because it introduced an infinite loop in rev 47154. This patch also adds a test to prevent the regression. ........ r51855 | neal.norwitz | 2006-09-11 06:28:16 +0200 (Mon, 11 Sep 2006) | 5 lines Properly handle a NULL returned from PyArena_New(). (Also fix some whitespace) Klocwork #364. ........ r51856 | neal.norwitz | 2006-09-11 06:32:57 +0200 (Mon, 11 Sep 2006) | 1 line Add a "crasher" taken from the sgml bug report referenced in the comment ........ r51858 | georg.brandl | 2006-09-11 11:38:35 +0200 (Mon, 11 Sep 2006) | 12 lines Forward-port of rev. 51857: Building with HP's cc on HP-UX turned up a couple of problems. _PyGILState_NoteThreadState was declared as static inconsistently. Make it static as it's not necessary outside of this module. Some tests failed because errno was reset to 0. (I think the tests that failed were at least: test_fcntl and test_mailbox). Ensure that errno doesn't change after a call to Py_END_ALLOW_THREADS. This only affected debug builds. ........ r51865 | martin.v.loewis | 2006-09-12 21:49:20 +0200 (Tue, 12 Sep 2006) | 2 lines Forward-port 51862: Add sgml_input.html. ........ r51866 | andrew.kuchling | 2006-09-12 22:50:23 +0200 (Tue, 12 Sep 2006) | 1 line Markup typo fix ........ r51867 | andrew.kuchling | 2006-09-12 23:09:02 +0200 (Tue, 12 Sep 2006) | 1 line Some editing, markup fixes ........ r51868 | andrew.kuchling | 2006-09-12 23:21:51 +0200 (Tue, 12 Sep 2006) | 1 line More wordsmithing ........ r51877 | andrew.kuchling | 2006-09-14 13:22:18 +0200 (Thu, 14 Sep 2006) | 1 line Make --help mention that -v can be supplied multiple times ........ r51878 | andrew.kuchling | 2006-09-14 13:28:50 +0200 (Thu, 14 Sep 2006) | 1 line Rewrite help message to remove some of the parentheticals. (There were a lot of them.) ........ r51883 | ka-ping.yee | 2006-09-15 02:34:19 +0200 (Fri, 15 Sep 2006) | 2 lines Fix grammar errors and improve clarity. ........ r51885 | georg.brandl | 2006-09-15 07:22:24 +0200 (Fri, 15 Sep 2006) | 3 lines Correct elementtree module index entry. ........ r51889 | fred.drake | 2006-09-15 17:18:04 +0200 (Fri, 15 Sep 2006) | 4 lines - fix module name in links in formatted documentation - minor markup cleanup (forward-ported from release25-maint revision 51888) ........ r51891 | fred.drake | 2006-09-15 18:11:27 +0200 (Fri, 15 Sep 2006) | 3 lines revise explanation of returns_unicode to reflect bool values and to include the default value (merged from release25-maint revision 51890) ........ r51897 | martin.v.loewis | 2006-09-16 19:36:37 +0200 (Sat, 16 Sep 2006) | 2 lines Patch #1557515: Add RLIMIT_SBSIZE. ........ r51903 | ronald.oussoren | 2006-09-17 20:42:53 +0200 (Sun, 17 Sep 2006) | 2 lines Port of revision 51902 in release25-maint to the trunk ........ r51904 | ronald.oussoren | 2006-09-17 21:23:27 +0200 (Sun, 17 Sep 2006) | 3 lines Tweak Mac/Makefile in to ensure that pythonw gets rebuild when the major version of python changes (2.5 -> 2.6). Bug #1552935. ........ r51913 | guido.van.rossum | 2006-09-18 23:36:16 +0200 (Mon, 18 Sep 2006) | 2 lines Make this thing executable. ........ r51920 | gregory.p.smith | 2006-09-19 19:35:04 +0200 (Tue, 19 Sep 2006) | 5 lines Fixes a bug with bsddb.DB.stat where the flags and txn keyword arguments are transposed. (reported by Louis Zechtzer) ..already committed to release24-maint ..needs committing to release25-maint ........ r51926 | brett.cannon | 2006-09-20 20:34:28 +0200 (Wed, 20 Sep 2006) | 3 lines Accidentally didn't commit Misc/NEWS entry on when __unicode__() was removed from exceptions. ........ r51927 | brett.cannon | 2006-09-20 20:43:13 +0200 (Wed, 20 Sep 2006) | 6 lines Allow exceptions to be directly sliced again (e.g., ``BaseException(1,2,3)[0:2]``). Discovered in Python 2.5.0 by Thomas Heller and reported to python-dev. This should be backported to 2.5 . ........ r51928 | brett.cannon | 2006-09-20 21:28:35 +0200 (Wed, 20 Sep 2006) | 2 lines Make python.vim output more deterministic. ........ r51949 | walter.doerwald | 2006-09-21 17:09:55 +0200 (Thu, 21 Sep 2006) | 2 lines Fix typo. ........ r51950 | jack.diederich | 2006-09-21 19:50:26 +0200 (Thu, 21 Sep 2006) | 5 lines * regression bug, count_next was coercing a Py_ssize_t to an unsigned Py_size_t which breaks negative counts * added test for negative numbers will backport to 2.5.1 ........ r51953 | jack.diederich | 2006-09-21 22:34:49 +0200 (Thu, 21 Sep 2006) | 1 line added itertools.count(-n) fix ........ r51971 | neal.norwitz | 2006-09-22 10:16:26 +0200 (Fri, 22 Sep 2006) | 10 lines Fix %zd string formatting on Mac OS X so it prints negative numbers. In addition to testing positive numbers, verify negative numbers work in configure. In order to avoid compiler warnings on OS X 10.4, also change the order of the check for the format character to use (PY_FORMAT_SIZE_T) in the sprintf format for Py_ssize_t. This patch changes PY_FORMAT_SIZE_T from "" to "l" if it wasn't defined at configure time. Need to verify the buildbot results. Backport candidate (if everyone thinks this patch can't be improved). ........ r51972 | neal.norwitz | 2006-09-22 10:18:10 +0200 (Fri, 22 Sep 2006) | 7 lines Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). These tests should be improved. Hopefully this fixes variations when flipping back and forth between fpdef and fplist. Backport candidate. ........ r51975 | neal.norwitz | 2006-09-22 10:47:23 +0200 (Fri, 22 Sep 2006) | 4 lines Mostly revert this file to the same version as before. Only force setting of PY_FORMAT_SIZE_T to "l" for Mac OSX. I don't know a better define to use. This should get rid of the warnings on other platforms and Mac too. ........ r51986 | fred.drake | 2006-09-23 02:26:31 +0200 (Sat, 23 Sep 2006) | 1 line add boilerplate "What's New" document so the docs will build ........ r51987 | neal.norwitz | 2006-09-23 06:11:38 +0200 (Sat, 23 Sep 2006) | 1 line Remove extra semi-colons reported by Johnny Lee on python-dev. Backport if anyone cares. ........ r51989 | neal.norwitz | 2006-09-23 20:11:58 +0200 (Sat, 23 Sep 2006) | 1 line SF Bug #1563963, add missing word and cleanup first sentance ........ r51990 | brett.cannon | 2006-09-23 21:53:20 +0200 (Sat, 23 Sep 2006) | 3 lines Make output on test_strptime() be more verbose in face of failure. This is in hopes that more information will help debug the failing test on HPPA Ubuntu. ........ r51991 | georg.brandl | 2006-09-24 12:36:01 +0200 (Sun, 24 Sep 2006) | 2 lines Fix webbrowser.BackgroundBrowser on Windows. ........ r51993 | georg.brandl | 2006-09-24 14:35:36 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in the parser's future statement handling that led to "with" not being recognized as a keyword after, e.g., this statement: from __future__ import division, with_statement ........ r51995 | georg.brandl | 2006-09-24 14:50:24 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in traceback.format_exception_only() that led to an error being raised when print_exc() was called without an exception set. In version 2.4, this printed "None", restored that behavior. ........ r52000 | armin.rigo | 2006-09-25 17:16:26 +0200 (Mon, 25 Sep 2006) | 2 lines Another crasher. ........ r52011 | brett.cannon | 2006-09-27 01:38:24 +0200 (Wed, 27 Sep 2006) | 2 lines Make the error message for when the time data and format do not match clearer. ........ r52014 | andrew.kuchling | 2006-09-27 18:37:30 +0200 (Wed, 27 Sep 2006) | 1 line Add news item for rev. 51815 ........ r52018 | andrew.kuchling | 2006-09-27 21:23:05 +0200 (Wed, 27 Sep 2006) | 1 line Make examples do error checking on Py_InitModule ........ r52032 | brett.cannon | 2006-09-29 00:10:14 +0200 (Fri, 29 Sep 2006) | 2 lines Very minor grammatical fix in a comment. ........ r52048 | george.yoshida | 2006-09-30 07:14:02 +0200 (Sat, 30 Sep 2006) | 4 lines SF bug #1567976 : fix typo Will backport to 2.5. ........ r52051 | gregory.p.smith | 2006-09-30 08:08:20 +0200 (Sat, 30 Sep 2006) | 2 lines wording change ........ r52053 | georg.brandl | 2006-09-30 09:24:48 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1567375: a minor logical glitch in example description. ........ r52056 | georg.brandl | 2006-09-30 09:31:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1565661: in webbrowser, split() the command for the default GNOME browser in case it is a command with args. ........ r52058 | georg.brandl | 2006-09-30 10:43:30 +0200 (Sat, 30 Sep 2006) | 4 lines Patch #1567691: super() and new.instancemethod() now don't accept keyword arguments any more (previously they accepted them, but didn't use them). ........ r52061 | georg.brandl | 2006-09-30 11:03:42 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566800: make sure that EnvironmentError can be called with any number of arguments, as was the case in Python 2.4. ........ r52063 | georg.brandl | 2006-09-30 11:06:45 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1566663: remove obsolete example from datetime docs. ........ r52065 | georg.brandl | 2006-09-30 11:13:21 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566602: correct failure of posixpath unittest when $HOME ends with a slash. ........ r52068 | georg.brandl | 2006-09-30 12:58:01 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes keep_blank_values and strict_parsing keyword arguments. ........ r52069 | georg.brandl | 2006-09-30 13:06:47 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1560617: in pyclbr, return full module name not only for classes, but also for functions. ........ r52072 | georg.brandl | 2006-09-30 13:17:34 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1556784: allow format strings longer than 127 characters in datetime's strftime function. ........ r52075 | georg.brandl | 2006-09-30 13:22:28 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1446043: correctly raise a LookupError if an encoding name given to encodings.search_function() contains a dot. ........ r52078 | georg.brandl | 2006-09-30 14:02:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1546052: clarify that PyString_FromString(AndSize) copies the string pointed to by its parameter. ........ r52080 | georg.brandl | 2006-09-30 14:16:03 +0200 (Sat, 30 Sep 2006) | 3 lines Convert test_import to unittest. ........ r52083 | kurt.kaiser | 2006-10-01 23:16:45 +0200 (Sun, 01 Oct 2006) | 5 lines Some syntax errors were being caught by tokenize during the tabnanny check, resulting in obscure error messages. Do the syntax check first. Bug 1562716, 1562719 ........ r52084 | kurt.kaiser | 2006-10-01 23:54:37 +0200 (Sun, 01 Oct 2006) | 3 lines Add comment explaining that error msgs may be due to user code when running w/o subprocess. ........ r52086 | martin.v.loewis | 2006-10-02 16:55:51 +0200 (Mon, 02 Oct 2006) | 3 lines Fix test for uintptr_t. Fixes #1568842. Will backport. ........ r52089 | martin.v.loewis | 2006-10-02 17:20:37 +0200 (Mon, 02 Oct 2006) | 3 lines Guard uintptr_t test with HAVE_STDINT_H, test for stdint.h. Will backport. ........ r52100 | vinay.sajip | 2006-10-03 20:02:37 +0200 (Tue, 03 Oct 2006) | 1 line Documentation omitted the additional parameter to LogRecord.__init__ which was added in 2.5. (See SF #1569622). ........ r52101 | vinay.sajip | 2006-10-03 20:20:26 +0200 (Tue, 03 Oct 2006) | 1 line Documentation clarified to mention optional parameters. ........ r52102 | vinay.sajip | 2006-10-03 20:21:56 +0200 (Tue, 03 Oct 2006) | 1 line Modified LogRecord.__init__ to make the func parameter optional. (See SF #1569622). ........ r52121 | brett.cannon | 2006-10-03 23:58:55 +0200 (Tue, 03 Oct 2006) | 2 lines Fix minor typo in a comment. ........ r52123 | brett.cannon | 2006-10-04 01:23:14 +0200 (Wed, 04 Oct 2006) | 2 lines Convert test_imp over to unittest. ........ r52128 | barry.warsaw | 2006-10-04 04:06:36 +0200 (Wed, 04 Oct 2006) | 3 lines decode_rfc2231(): As Christian Robottom Reis points out, it makes no sense to test for parts > 3 when we use .split(..., 2). ........ r52129 | jeremy.hylton | 2006-10-04 04:24:52 +0200 (Wed, 04 Oct 2006) | 9 lines Fix for SF bug 1569998: break permitted inside try. The compiler was checking that there was something on the fblock stack, but not that there was a loop on the stack. Fixed that and added a test for the specific syntax error. Bug fix candidate. ........ r52130 | martin.v.loewis | 2006-10-04 07:47:34 +0200 (Wed, 04 Oct 2006) | 4 lines Fix integer negation and absolute value to not rely on undefined behaviour of the C compiler anymore. Will backport to 2.5 and 2.4. ........ r52135 | martin.v.loewis | 2006-10-04 11:21:20 +0200 (Wed, 04 Oct 2006) | 1 line Forward port r52134: Add uuids for 2.4.4. ........ r52137 | armin.rigo | 2006-10-04 12:23:57 +0200 (Wed, 04 Oct 2006) | 3 lines Compilation problem caused by conflicting typedefs for uint32_t (unsigned long vs. unsigned int). ........ r52139 | armin.rigo | 2006-10-04 14:17:45 +0200 (Wed, 04 Oct 2006) | 23 lines Forward-port of r52136,52138: a review of overflow-detecting code. * unified the way intobject, longobject and mystrtoul handle values around -sys.maxint-1. * in general, trying to entierely avoid overflows in any computation involving signed ints or longs is extremely involved. Fixed a few simple cases where a compiler might be too clever (but that's all guesswork). * more overflow checks against bad data in marshal.c. * 2.5 specific: fixed a number of places that were still confusing int and Py_ssize_t. Some of them could potentially have caused "real-world" breakage. * list.pop(x): fixing overflow issues on x was messy. I just reverted to PyArg_ParseTuple("n"), which does the right thing. (An obscure test was trying to give a Decimal to list.pop()... doesn't make sense any more IMHO) * trying to write a few tests... ........ r52147 | andrew.kuchling | 2006-10-04 15:42:43 +0200 (Wed, 04 Oct 2006) | 6 lines Cause a PyObject_Malloc() failure to trigger a MemoryError, and then add 'if (PyErr_Occurred())' checks to various places so that NULL is returned properly. 2.4 backport candidate. ........ r52148 | martin.v.loewis | 2006-10-04 17:25:28 +0200 (Wed, 04 Oct 2006) | 1 line Add MSVC8 project files to create wininst-8.exe. ........ r52196 | brett.cannon | 2006-10-06 00:02:31 +0200 (Fri, 06 Oct 2006) | 7 lines Clarify what "re-initialization" means for init_builtin() and init_dynamic(). Also remove warning about re-initialization as possibly raising an execption as both call _PyImport_FindExtension() which pulls any module that was already imported from the Python process' extension cache and just copies the __dict__ into the module stored in sys.modules. ........ r52200 | fred.drake | 2006-10-06 02:03:45 +0200 (Fri, 06 Oct 2006) | 3 lines - update links - remove Sleepycat name now that they have been bought ........ r52204 | andrew.kuchling | 2006-10-06 12:41:01 +0200 (Fri, 06 Oct 2006) | 1 line Case fix ........ r52208 | georg.brandl | 2006-10-06 14:46:08 +0200 (Fri, 06 Oct 2006) | 3 lines Fix name. ........ r52211 | andrew.kuchling | 2006-10-06 15:18:26 +0200 (Fri, 06 Oct 2006) | 1 line [Bug #1545341] Allow 'classifier' parameter to be a tuple as well as a list. Will backport. ........ r52212 | armin.rigo | 2006-10-06 18:33:22 +0200 (Fri, 06 Oct 2006) | 4 lines A very minor bug fix: this code looks like it is designed to accept any hue value and do the modulo itself, except it doesn't quite do it in all cases. At least, the "cannot get here" comment was wrong. ........ r52213 | andrew.kuchling | 2006-10-06 20:51:55 +0200 (Fri, 06 Oct 2006) | 1 line Comment grammar ........ r52218 | skip.montanaro | 2006-10-07 13:05:02 +0200 (Sat, 07 Oct 2006) | 6 lines Note that the excel_tab class is registered as the "excel-tab" dialect. Fixes 1572471. Make a similar change for the excel class and clean up references to the Dialects and Formatting Parameters section in a few places. ........ r52221 | georg.brandl | 2006-10-08 09:11:54 +0200 (Sun, 08 Oct 2006) | 3 lines Add missing NEWS entry for rev. 52129. ........ r52223 | hyeshik.chang | 2006-10-08 15:48:34 +0200 (Sun, 08 Oct 2006) | 3 lines Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault when encoding non-BMP unicode characters. (Submitted by Ray Chason) ........ r52227 | ronald.oussoren | 2006-10-08 19:37:58 +0200 (Sun, 08 Oct 2006) | 4 lines Add version number to the link to the python documentation in /Developer/Documentation/Python, better for users that install multiple versions of python. ........ r52229 | ronald.oussoren | 2006-10-08 19:40:02 +0200 (Sun, 08 Oct 2006) | 2 lines Fix for bug #1570284 ........ r52233 | ronald.oussoren | 2006-10-08 19:49:52 +0200 (Sun, 08 Oct 2006) | 6 lines MacOSX: distutils changes the values of BASECFLAGS and LDFLAGS when using a universal build of python on OSX 10.3 to ensure that those flags can be used to compile code (the universal build uses compiler flags that aren't supported on 10.3). This patches gives the same treatment to CFLAGS, PY_CFLAGS and BLDSHARED. ........ r52236 | ronald.oussoren | 2006-10-08 19:51:46 +0200 (Sun, 08 Oct 2006) | 5 lines MacOSX: The universal build requires that users have the MacOSX10.4u SDK installed to build extensions. This patch makes distutils emit a warning when the compiler should use an SDK but that SDK is not installed, hopefully reducing some confusion. ........ r52238 | ronald.oussoren | 2006-10-08 20:18:26 +0200 (Sun, 08 Oct 2006) | 3 lines MacOSX: add more logic to recognize the correct startup file to patch to the shell profile patching post-install script. ........ r52242 | andrew.kuchling | 2006-10-09 19:10:12 +0200 (Mon, 09 Oct 2006) | 1 line Add news item for rev. 52211 change ........ r52245 | andrew.kuchling | 2006-10-09 20:05:19 +0200 (Mon, 09 Oct 2006) | 1 line Fix wording in comment ........ r52251 | georg.brandl | 2006-10-09 21:03:06 +0200 (Mon, 09 Oct 2006) | 2 lines Patch #1572724: fix typo ('=' instead of '==') in _msi.c. ........ r52255 | barry.warsaw | 2006-10-09 21:43:24 +0200 (Mon, 09 Oct 2006) | 2 lines List gc.get_count() in the module docstring. ........ r52257 | martin.v.loewis | 2006-10-09 22:44:25 +0200 (Mon, 09 Oct 2006) | 1 line Bug #1565150: Fix subsecond processing for os.utime on Windows. ........ r52268 | ronald.oussoren | 2006-10-10 09:55:06 +0200 (Tue, 10 Oct 2006) | 2 lines MacOSX: fix permission problem in the generated installer ........ r52293 | georg.brandl | 2006-10-12 09:38:04 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1575746: fix typo in property() docs. ........ r52295 | georg.brandl | 2006-10-12 09:57:21 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #813342: Start the IDLE subprocess with -Qnew if the parent is started with that option. ........ r52297 | georg.brandl | 2006-10-12 10:22:53 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1565919: document set types in the Language Reference. ........ r52299 | georg.brandl | 2006-10-12 11:20:33 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1550524: better heuristics to find correct class definition in inspect.findsource(). ........ r52301 | georg.brandl | 2006-10-12 11:47:12 +0200 (Thu, 12 Oct 2006) | 4 lines Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode arguments with the system default encoding just like the write() method does, instead of converting it to a raw buffer. ........ r52303 | georg.brandl | 2006-10-12 13:14:40 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1546628: add a note about urlparse.urljoin() and absolute paths. ........ r52305 | georg.brandl | 2006-10-12 13:27:59 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1545497: when given an explicit base, int() did ignore NULs embedded in the string to convert. ........ r52307 | georg.brandl | 2006-10-12 13:41:11 +0200 (Thu, 12 Oct 2006) | 3 lines Add a note to fpectl docs that it's not built by default (bug #1556261). ........ r52309 | georg.brandl | 2006-10-12 13:46:57 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560114: the Mac filesystem does have accurate information about the case of filenames. ........ r52311 | georg.brandl | 2006-10-12 13:59:27 +0200 (Thu, 12 Oct 2006) | 2 lines Small grammar fix, thanks Sjoerd. ........ r52313 | georg.brandl | 2006-10-12 14:03:07 +0200 (Thu, 12 Oct 2006) | 2 lines Fix tarfile depending on buggy int('1\0', base) behavior. ........ r52315 | georg.brandl | 2006-10-12 14:33:07 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1283491: follow docstring convention wrt. keyword-able args in sum(). ........ r52316 | georg.brandl | 2006-10-12 15:08:16 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560179: speed up posixpath.(dir|base)name ........ r52327 | brett.cannon | 2006-10-14 08:36:45 +0200 (Sat, 14 Oct 2006) | 3 lines Clean up the language of a sentence relating to the connect() function and user-defined datatypes. ........ r52332 | neal.norwitz | 2006-10-14 23:33:38 +0200 (Sat, 14 Oct 2006) | 3 lines Update the peephole optimizer to remove more dead code (jumps after returns) and inline jumps to returns. ........ r52333 | martin.v.loewis | 2006-10-15 09:54:40 +0200 (Sun, 15 Oct 2006) | 4 lines Patch #1576954: Update VC6 build directory; remove redundant files in VC7. Will backport to 2.5. ........ r52335 | martin.v.loewis | 2006-10-15 10:43:33 +0200 (Sun, 15 Oct 2006) | 1 line Patch #1576166: Support os.utime for directories on Windows NT+. ........ r52336 | martin.v.loewis | 2006-10-15 10:51:22 +0200 (Sun, 15 Oct 2006) | 2 lines Patch #1577551: Add ctypes and ET build support for VC6. Will backport to 2.5. ........ r52338 | martin.v.loewis | 2006-10-15 11:35:51 +0200 (Sun, 15 Oct 2006) | 1 line Loosen the test for equal time stamps. ........ r52339 | martin.v.loewis | 2006-10-15 11:43:39 +0200 (Sun, 15 Oct 2006) | 2 lines Bug #1567666: Emulate GetFileAttributesExA for Win95. Will backport to 2.5. ........ r52341 | martin.v.loewis | 2006-10-15 13:02:07 +0200 (Sun, 15 Oct 2006) | 2 lines Round to int, because some systems support sub-second time stamps in stat, but not in utime. Also be consistent with modifying only mtime, not atime. ........ r52342 | martin.v.loewis | 2006-10-15 13:57:40 +0200 (Sun, 15 Oct 2006) | 2 lines Set the eol-style for project files to "CRLF". ........ r52343 | martin.v.loewis | 2006-10-15 13:59:56 +0200 (Sun, 15 Oct 2006) | 3 lines Drop binary property on dsp files, set eol-style to CRLF instead. ........ r52344 | martin.v.loewis | 2006-10-15 14:01:43 +0200 (Sun, 15 Oct 2006) | 2 lines Remove binary property, set eol-style to CRLF instead. ........ r52346 | martin.v.loewis | 2006-10-15 16:30:38 +0200 (Sun, 15 Oct 2006) | 2 lines Mention the bdist_msi module. Will backport to 2.5. ........ r52354 | brett.cannon | 2006-10-16 05:09:52 +0200 (Mon, 16 Oct 2006) | 3 lines Fix turtle so that you can launch the demo2 function on its own instead of only when the module is launched as a script. ........ r52356 | martin.v.loewis | 2006-10-17 17:18:06 +0200 (Tue, 17 Oct 2006) | 2 lines Patch #1457736: Update VC6 to use current PCbuild settings. Will backport to 2.5. ........ r52360 | martin.v.loewis | 2006-10-17 20:09:55 +0200 (Tue, 17 Oct 2006) | 2 lines Remove obsolete file. Will backport. ........ r52363 | martin.v.loewis | 2006-10-17 20:59:23 +0200 (Tue, 17 Oct 2006) | 4 lines Forward-port r52358: - Bug #1578513: Cross compilation was broken by a change to configure. Repair so that it's back to how it was in 2.4.3. ........ r52365 | thomas.heller | 2006-10-17 21:30:48 +0200 (Tue, 17 Oct 2006) | 6 lines ctypes callback functions only support 'fundamental' result types. Check this and raise an error when something else is used - before this change ctypes would hang or crash when such a callback was called. This is a partial fix for #1574584. Will backport to release25-maint. ........ r52377 | tim.peters | 2006-10-18 07:06:06 +0200 (Wed, 18 Oct 2006) | 2 lines newIobject(): repaired incorrect cast to quiet MSVC warning. ........ r52378 | tim.peters | 2006-10-18 07:09:12 +0200 (Wed, 18 Oct 2006) | 2 lines Whitespace normalization. ........ r52379 | tim.peters | 2006-10-18 07:10:28 +0200 (Wed, 18 Oct 2006) | 2 lines Add missing svn:eol-style to text files. ........ r52387 | martin.v.loewis | 2006-10-19 12:58:46 +0200 (Thu, 19 Oct 2006) | 3 lines Add check for the PyArg_ParseTuple format, and declare it if it is supported. ........ r52388 | martin.v.loewis | 2006-10-19 13:00:37 +0200 (Thu, 19 Oct 2006) | 3 lines Fix various minor errors in passing arguments to PyArg_ParseTuple. ........ r52389 | martin.v.loewis | 2006-10-19 18:01:37 +0200 (Thu, 19 Oct 2006) | 2 lines Restore CFLAGS after checking for __attribute__ ........ r52390 | andrew.kuchling | 2006-10-19 23:55:55 +0200 (Thu, 19 Oct 2006) | 1 line [Bug #1576348] Fix typo in example ........ r52414 | walter.doerwald | 2006-10-22 10:59:41 +0200 (Sun, 22 Oct 2006) | 2 lines Port test___future__ to unittest. ........ r52415 | ronald.oussoren | 2006-10-22 12:45:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580674: with this patch os.readlink uses the filesystem encoding to decode unicode objects and returns an unicode object when the argument is one. ........ r52416 | martin.v.loewis | 2006-10-22 12:46:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580872: Remove duplicate declaration of PyCallable_Check. Will backport to 2.5. ........ r52418 | martin.v.loewis | 2006-10-22 12:55:15 +0200 (Sun, 22 Oct 2006) | 4 lines - Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that ctypes isn't considered as requiring executable stacks. Will backport to 2.5. ........ r52420 | martin.v.loewis | 2006-10-22 15:45:13 +0200 (Sun, 22 Oct 2006) | 3 lines Remove passwd.adjunct.byname from list of maps for test_nis. Will backport to 2.5. ........ r52431 | georg.brandl | 2006-10-24 18:54:16 +0200 (Tue, 24 Oct 2006) | 2 lines Patch [ 1583506 ] tarfile.py: 100-char filenames are truncated ........ r52446 | andrew.kuchling | 2006-10-26 21:10:46 +0200 (Thu, 26 Oct 2006) | 1 line [Bug #1579796] Wrong syntax for PyDateTime_IMPORT in documentation. Reported by David Faure. ........ r52449 | andrew.kuchling | 2006-10-26 21:16:46 +0200 (Thu, 26 Oct 2006) | 1 line Typo fix ........ r52452 | martin.v.loewis | 2006-10-27 08:16:31 +0200 (Fri, 27 Oct 2006) | 3 lines Patch #1549049: Rewrite type conversion in structmember. Fixes #1545696 and #1566140. Will backport to 2.5. ........ r52454 | martin.v.loewis | 2006-10-27 08:42:27 +0200 (Fri, 27 Oct 2006) | 2 lines Check for values.h. Will backport. ........ r52456 | martin.v.loewis | 2006-10-27 09:06:52 +0200 (Fri, 27 Oct 2006) | 2 lines Get DBL_MAX from float.h not values.h. Will backport. ........ r52458 | martin.v.loewis | 2006-10-27 09:13:28 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1567274: Support SMTP over TLS. ........ r52459 | andrew.kuchling | 2006-10-27 13:33:29 +0200 (Fri, 27 Oct 2006) | 1 line Set svn:keywords property ........ r52460 | andrew.kuchling | 2006-10-27 13:36:41 +0200 (Fri, 27 Oct 2006) | 1 line Add item ........ r52461 | andrew.kuchling | 2006-10-27 13:37:01 +0200 (Fri, 27 Oct 2006) | 1 line Some wording changes and markup fixes ........ r52462 | andrew.kuchling | 2006-10-27 14:18:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1585690] Note that line_num was added in Python 2.5 ........ r52464 | andrew.kuchling | 2006-10-27 14:50:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1583946] Reword description of server and issuer ........ r52466 | andrew.kuchling | 2006-10-27 15:06:25 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1562583] Mention the set_reuse_addr() method ........ r52469 | andrew.kuchling | 2006-10-27 15:22:46 +0200 (Fri, 27 Oct 2006) | 4 lines [Bug #1542016] Report PCALL_POP value. This makes the return value of sys.callstats() match its docstring. Backport candidate. Though it's an API change, this is a pretty obscure portion of the API. ........ r52473 | andrew.kuchling | 2006-10-27 16:53:41 +0200 (Fri, 27 Oct 2006) | 1 line Point users to the subprocess module in the docs for os.system, os.spawn*, os.popen2, and the popen2 and commands modules ........ r52476 | andrew.kuchling | 2006-10-27 18:39:10 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1576241] Let functools.wraps work with built-in functions ........ r52478 | andrew.kuchling | 2006-10-27 18:55:34 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1575506] The _singlefileMailbox class was using the wrong file object in its flush() method, causing an error ........ r52480 | andrew.kuchling | 2006-10-27 19:06:16 +0200 (Fri, 27 Oct 2006) | 1 line Clarify docstring ........ r52481 | andrew.kuchling | 2006-10-27 19:11:23 +0200 (Fri, 27 Oct 2006) | 5 lines [Patch #1574068 by Scott Dial] urllib and urllib2 were using base64.encodestring() for encoding authentication data. encodestring() can include newlines for very long input, which produced broken HTTP headers. ........ r52483 | andrew.kuchling | 2006-10-27 20:13:46 +0200 (Fri, 27 Oct 2006) | 1 line Check db_setup_debug for a few print statements; change sqlite_setup_debug to False ........ r52484 | andrew.kuchling | 2006-10-27 20:15:02 +0200 (Fri, 27 Oct 2006) | 1 line [Patch #1503717] Tiny patch from Chris AtLee to stop a lengthy line from being printed ........ r52485 | thomas.heller | 2006-10-27 20:31:36 +0200 (Fri, 27 Oct 2006) | 5 lines WindowsError.str should display the windows error code, not the posix error code; with test. Fixes #1576174. Will backport to release25-maint. ........ r52487 | thomas.heller | 2006-10-27 21:05:53 +0200 (Fri, 27 Oct 2006) | 4 lines Modulefinder now handles absolute and relative imports, including tests. Will backport to release25-maint. ........ r52488 | georg.brandl | 2006-10-27 22:39:43 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1552024: add decorator support to unparse.py demo script. ........ r52492 | walter.doerwald | 2006-10-28 12:47:12 +0200 (Sat, 28 Oct 2006) | 2 lines Port test_bufio to unittest. ........ r52493 | georg.brandl | 2006-10-28 15:10:17 +0200 (Sat, 28 Oct 2006) | 6 lines Convert test_global, test_scope and test_grammar to unittest. I tried to enclose all tests which must be run at the toplevel (instead of inside a method) in exec statements. ........ r52494 | georg.brandl | 2006-10-28 15:11:41 +0200 (Sat, 28 Oct 2006) | 3 lines Update outstanding bugs test file. ........ r52495 | georg.brandl | 2006-10-28 15:51:49 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_math to unittest. ........ r52496 | georg.brandl | 2006-10-28 15:56:58 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_opcodes to unittest. ........ r52497 | georg.brandl | 2006-10-28 18:04:04 +0200 (Sat, 28 Oct 2006) | 2 lines Fix nth() itertool recipe. ........ r52500 | georg.brandl | 2006-10-28 22:25:09 +0200 (Sat, 28 Oct 2006) | 2 lines make test_grammar pass with python -O ........ r52501 | neal.norwitz | 2006-10-28 23:15:30 +0200 (Sat, 28 Oct 2006) | 6 lines Add some asserts. In sysmodule, I think these were to try to silence some warnings from Klokwork. They verify the assumptions of the format of svn version output. The assert in the thread module helped debug a problem on HP-UX. ........ r52502 | neal.norwitz | 2006-10-28 23:16:54 +0200 (Sat, 28 Oct 2006) | 5 lines Fix warnings with HP's C compiler. It doesn't recognize that infinite loops are, um, infinite. These conditions should not be able to happen. Will backport. ........ r52503 | neal.norwitz | 2006-10-28 23:17:51 +0200 (Sat, 28 Oct 2006) | 5 lines Fix crash in test on HP-UX. Apparently, it's not possible to delete a lock if it's held (even by the current thread). Will backport. ........ r52504 | neal.norwitz | 2006-10-28 23:19:07 +0200 (Sat, 28 Oct 2006) | 6 lines Fix bug #1565514, SystemError not raised on too many nested blocks. It seems like this should be a different error than SystemError, but I don't have any great ideas and SystemError was raised in 2.4 and earlier. Will backport. ........ r52505 | neal.norwitz | 2006-10-28 23:20:12 +0200 (Sat, 28 Oct 2006) | 4 lines Prevent crash if alloc of garbage fails. Found by Typo.pl. Will backport. ........ r52506 | neal.norwitz | 2006-10-28 23:21:00 +0200 (Sat, 28 Oct 2006) | 4 lines Don't inline Py_ADDRESS_IN_RANGE with gcc 4+ either. Will backport. ........ r52513 | neal.norwitz | 2006-10-28 23:56:49 +0200 (Sat, 28 Oct 2006) | 2 lines Fix test_modulefinder so it doesn't fail when run after test_distutils. ........ r52514 | neal.norwitz | 2006-10-29 00:12:26 +0200 (Sun, 29 Oct 2006) | 4 lines From SF 1557890, fix problem of using wrong type in example. Will backport. ........ r52517 | georg.brandl | 2006-10-29 09:39:22 +0100 (Sun, 29 Oct 2006) | 4 lines Fix codecs.EncodedFile which did not use file_encoding in 2.5.0, and fix all codecs file wrappers to work correctly with the "with" statement (bug #1586513). ........ r52519 | georg.brandl | 2006-10-29 09:47:08 +0100 (Sun, 29 Oct 2006) | 3 lines Clean up a leftover from old listcomp generation code. ........ r52520 | georg.brandl | 2006-10-29 09:53:06 +0100 (Sun, 29 Oct 2006) | 4 lines Bug #1586448: the compiler module now emits the same bytecode for list comprehensions as the builtin compiler, using the LIST_APPEND opcode. ........ r52521 | georg.brandl | 2006-10-29 10:01:01 +0100 (Sun, 29 Oct 2006) | 3 lines Remove trailing comma. ........ r52522 | georg.brandl | 2006-10-29 10:05:04 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1357915: allow all sequence types for shell arguments in subprocess. ........ r52524 | georg.brandl | 2006-10-29 10:16:12 +0100 (Sun, 29 Oct 2006) | 3 lines Patch #1583880: fix tarfile's problems with long names and posix/ GNU modes. ........ r52526 | georg.brandl | 2006-10-29 10:18:00 +0100 (Sun, 29 Oct 2006) | 3 lines Test assert if __debug__ is true. ........ r52527 | georg.brandl | 2006-10-29 10:32:16 +0100 (Sun, 29 Oct 2006) | 2 lines Fix the new EncodedFile test to work with big endian platforms. ........ r52529 | georg.brandl | 2006-10-29 15:39:09 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586613: fix zlib and bz2 codecs' incremental en/decoders. ........ r52532 | georg.brandl | 2006-10-29 19:01:08 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586773: extend hashlib docstring. ........ r52534 | neal.norwitz | 2006-10-29 19:30:10 +0100 (Sun, 29 Oct 2006) | 4 lines Update comments, remove commented out code. Move assembler structure next to assembler code to make it easier to move it to a separate file. ........ r52535 | georg.brandl | 2006-10-29 19:31:42 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1576657: when setting a KeyError for a tuple key, make sure that the tuple isn't used as the "exception arguments tuple". ........ r52537 | georg.brandl | 2006-10-29 20:13:40 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_mmap to unittest. ........ r52538 | georg.brandl | 2006-10-29 20:20:45 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_poll to unittest. ........ r52539 | georg.brandl | 2006-10-29 20:24:43 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_nis to unittest. ........ r52540 | georg.brandl | 2006-10-29 20:35:03 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_types to unittest. ........ r52541 | georg.brandl | 2006-10-29 20:51:16 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cookie to unittest. ........ r52542 | georg.brandl | 2006-10-29 21:09:12 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cgi to unittest. ........ r52543 | georg.brandl | 2006-10-29 21:24:01 +0100 (Sun, 29 Oct 2006) | 3 lines Completely convert test_httplib to unittest. ........ r52544 | georg.brandl | 2006-10-29 21:28:26 +0100 (Sun, 29 Oct 2006) | 2 lines Convert test_MimeWriter to unittest. ........ r52545 | georg.brandl | 2006-10-29 21:31:17 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_openpty to unittest. ........ r52546 | georg.brandl | 2006-10-29 21:35:12 +0100 (Sun, 29 Oct 2006) | 3 lines Remove leftover test output file. ........ r52547 | georg.brandl | 2006-10-29 22:54:18 +0100 (Sun, 29 Oct 2006) | 3 lines Move the check for openpty to the beginning. ........ r52548 | walter.doerwald | 2006-10-29 23:06:28 +0100 (Sun, 29 Oct 2006) | 2 lines Add tests for basic argument errors. ........ r52549 | walter.doerwald | 2006-10-30 00:02:27 +0100 (Mon, 30 Oct 2006) | 3 lines Add tests for incremental codecs with an errors argument. ........ r52550 | neal.norwitz | 2006-10-30 00:39:03 +0100 (Mon, 30 Oct 2006) | 1 line Fix refleak ........ r52552 | neal.norwitz | 2006-10-30 00:58:36 +0100 (Mon, 30 Oct 2006) | 1 line I'm assuming this is correct, it fixes the tests so they pass again ........ r52555 | vinay.sajip | 2006-10-31 18:32:37 +0100 (Tue, 31 Oct 2006) | 1 line Change to improve speed of _fixupChildren ........ r52556 | vinay.sajip | 2006-10-31 18:34:31 +0100 (Tue, 31 Oct 2006) | 1 line Added relativeCreated to Formatter doc (has been in the system for a long time - was unaccountably left out of the docs and not noticed until now). ........ r52588 | thomas.heller | 2006-11-02 20:48:24 +0100 (Thu, 02 Nov 2006) | 5 lines Replace the XXX marker in the 'Arrays and pointers' reference manual section with a link to the tutorial sections. Will backport to release25-maint. ........ r52592 | thomas.heller | 2006-11-02 21:22:29 +0100 (Thu, 02 Nov 2006) | 6 lines Fix a code example by adding a missing import. Fixes #1557890. Will backport to release25-maint. ........ r52598 | tim.peters | 2006-11-03 03:32:46 +0100 (Fri, 03 Nov 2006) | 2 lines Whitespace normalization. ........ r52619 | martin.v.loewis | 2006-11-04 19:14:06 +0100 (Sat, 04 Nov 2006) | 4 lines - Patch #1060577: Extract list of RPM files from spec file in bdist_rpm Will backport to 2.5. ........ r52621 | neal.norwitz | 2006-11-04 20:25:22 +0100 (Sat, 04 Nov 2006) | 4 lines Bug #1588287: fix invalid assertion for `1,2` in debug builds. Will backport ........ r52630 | andrew.kuchling | 2006-11-05 22:04:37 +0100 (Sun, 05 Nov 2006) | 1 line Update link ........ r52631 | skip.montanaro | 2006-11-06 15:34:52 +0100 (Mon, 06 Nov 2006) | 1 line note that user can control directory location even if default dir is used ........ r52644 | ronald.oussoren | 2006-11-07 16:53:38 +0100 (Tue, 07 Nov 2006) | 2 lines Fix a number of typos in strings and comments (sf#1589070) ........ r52647 | ronald.oussoren | 2006-11-07 17:00:34 +0100 (Tue, 07 Nov 2006) | 2 lines Whitespace changes to make the source more compliant with PEP8 (SF#1589070) ........ r52651 | thomas.heller | 2006-11-07 19:01:18 +0100 (Tue, 07 Nov 2006) | 3 lines Fix markup. Will backport to release25-maint. ........ r52653 | thomas.heller | 2006-11-07 19:20:47 +0100 (Tue, 07 Nov 2006) | 3 lines Fix grammatical error as well. Will backport to release25-maint. ........ r52657 | andrew.kuchling | 2006-11-07 21:39:16 +0100 (Tue, 07 Nov 2006) | 1 line Add missing word ........ r52662 | martin.v.loewis | 2006-11-08 07:46:37 +0100 (Wed, 08 Nov 2006) | 4 lines Correctly forward exception in instance_contains(). Fixes #1591996. Patch contributed by Neal Norwitz. Will backport. ........ r52664 | martin.v.loewis | 2006-11-08 07:48:36 +0100 (Wed, 08 Nov 2006) | 2 lines News entry for 52662. ........ r52665 | martin.v.loewis | 2006-11-08 08:35:55 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1351744: Add askyesnocancel helper for tkMessageBox. ........ r52666 | georg.brandl | 2006-11-08 08:45:59 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1592072: fix docs for return value of PyErr_CheckSignals. ........ r52668 | georg.brandl | 2006-11-08 11:04:29 +0100 (Wed, 08 Nov 2006) | 3 lines Bug #1592533: rename variable in heapq doc example, to avoid shadowing "sorted". ........ r52671 | andrew.kuchling | 2006-11-08 14:35:34 +0100 (Wed, 08 Nov 2006) | 1 line Add section on the functional module ........ r52672 | andrew.kuchling | 2006-11-08 15:14:30 +0100 (Wed, 08 Nov 2006) | 1 line Add section on operator module; make a few edits ........ r52673 | andrew.kuchling | 2006-11-08 15:24:03 +0100 (Wed, 08 Nov 2006) | 1 line Add table of contents; this required fixing a few headings. Some more smalle edits. ........ r52674 | andrew.kuchling | 2006-11-08 15:30:14 +0100 (Wed, 08 Nov 2006) | 1 line More edits ........ r52686 | martin.v.loewis | 2006-11-09 12:06:03 +0100 (Thu, 09 Nov 2006) | 3 lines Patch #838546: Make terminal become controlling in pty.fork(). Will backport to 2.5. ........ r52688 | martin.v.loewis | 2006-11-09 12:27:32 +0100 (Thu, 09 Nov 2006) | 2 lines Patch #1592250: Add elidge argument to Tkinter.Text.search. ........ r52690 | andrew.kuchling | 2006-11-09 14:27:07 +0100 (Thu, 09 Nov 2006) | 7 lines [Bug #1569790] mailbox.Maildir.get_folder() loses factory information Both the Maildir and MH classes had this bug; the patch fixes both classes and adds a test. Will backport to 25-maint. ........ r52692 | andrew.kuchling | 2006-11-09 14:51:14 +0100 (Thu, 09 Nov 2006) | 1 line [Patch #1514544 by David Watson] use fsync() to ensure data is really on disk ........ r52695 | walter.doerwald | 2006-11-09 17:23:26 +0100 (Thu, 09 Nov 2006) | 2 lines Replace C++ comment with C comment (fixes SF bug #1593525). ........ r52712 | andrew.kuchling | 2006-11-09 22:16:46 +0100 (Thu, 09 Nov 2006) | 11 lines [Patch #1514543] mailbox (Maildir): avoid losing messages on name clash Two changes: Where possible, use link()/remove() to move files into a directory; this makes it easier to avoid overwriting an existing file. Use _create_carefully() to create files in tmp/, which uses O_EXCL. Backport candidate. ........ r52716 | phillip.eby | 2006-11-10 01:33:36 +0100 (Fri, 10 Nov 2006) | 4 lines Fix SF#1566719: not creating site-packages (or other target directory) when installing .egg-info for a project that contains no modules or packages, while using --root (as in bdist_rpm). ........ r52719 | andrew.kuchling | 2006-11-10 14:14:01 +0100 (Fri, 10 Nov 2006) | 1 line Reword entry ........ r52725 | andrew.kuchling | 2006-11-10 15:39:01 +0100 (Fri, 10 Nov 2006) | 1 line [Feature request #1542920] Link to wsgi.org ........ r52731 | georg.brandl | 2006-11-11 19:29:11 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594742: wrong word in stringobject doc. ........ r52733 | georg.brandl | 2006-11-11 19:32:47 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594758: wording improvement for dict.update() docs. ........ r52736 | martin.v.loewis | 2006-11-12 11:32:47 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1065257: Support passing open files as body in HTTPConnection.request(). ........ r52737 | martin.v.loewis | 2006-11-12 11:41:39 +0100 (Sun, 12 Nov 2006) | 2 lines Patch #1355023: support whence argument for GzipFile.seek. ........ r52738 | martin.v.loewis | 2006-11-12 19:24:26 +0100 (Sun, 12 Nov 2006) | 2 lines Bug #1067760: Deprecate passing floats to file.seek. ........ r52739 | martin.v.loewis | 2006-11-12 19:48:13 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1359217: Ignore 2xx response before 150 response. Will backport to 2.5. ........ r52741 | martin.v.loewis | 2006-11-12 19:56:03 +0100 (Sun, 12 Nov 2006) | 4 lines Patch #1360200: Use unmangled_version RPM spec field to deal with file name mangling. Will backport to 2.5. ........ r52753 | walter.doerwald | 2006-11-15 17:23:46 +0100 (Wed, 15 Nov 2006) | 2 lines Fix typo. ........ r52754 | georg.brandl | 2006-11-15 18:42:03 +0100 (Wed, 15 Nov 2006) | 2 lines Bug #1594809: add a note to README regarding PYTHONPATH and make install. ........ r52762 | georg.brandl | 2006-11-16 16:05:14 +0100 (Thu, 16 Nov 2006) | 2 lines Bug #1597576: mention that the new base64 api has been introduced in py2.4. ........ r52764 | georg.brandl | 2006-11-16 17:50:59 +0100 (Thu, 16 Nov 2006) | 3 lines Bug #1597824: return the registered function from atexit.register() to facilitate usage as a decorator. ........ r52765 | georg.brandl | 2006-11-16 18:08:45 +0100 (Thu, 16 Nov 2006) | 4 lines Bug #1588217: don't parse "= " as a soft line break in binascii's a2b_qp() function, instead leave it in the string as quopri.decode() does. ........ r52776 | andrew.kuchling | 2006-11-17 14:30:25 +0100 (Fri, 17 Nov 2006) | 17 lines Remove file-locking in MH.pack() method. This change looks massive but it's mostly a re-indenting after removing some try...finally blocks. Also adds a test case that does a pack() while the mailbox is locked; this test would have turned up bugs in the original code on some platforms. In both nmh and GNU Mailutils' implementation of MH-format mailboxes, no locking is done of individual message files when renaming them. The original mailbox.py code did do locking, which meant that message files had to be opened. This code was buggy on certain platforms (found through reading the code); there were code paths that closed the file object and then called _unlock_file() on it. Will backport to 25-maint once I see how the buildbots react to this patch. ........ r52780 | martin.v.loewis | 2006-11-18 19:00:23 +0100 (Sat, 18 Nov 2006) | 5 lines Patch #1538878: Don't make tkSimpleDialog dialogs transient if the parent window is withdrawn. This mirrors what dialog.tcl does. Will backport to 2.5. ........ r52782 | martin.v.loewis | 2006-11-18 19:05:35 +0100 (Sat, 18 Nov 2006) | 4 lines Patch #1594554: Always close a tkSimpleDialog on ok(), even if an exception occurs. Will backport to 2.5. ........ r52784 | martin.v.loewis | 2006-11-18 19:42:11 +0100 (Sat, 18 Nov 2006) | 3 lines Patch #1472877: Fix Tix subwidget name resolution. Will backport to 2.5. ........ r52786 | andrew.kuchling | 2006-11-18 23:17:33 +0100 (Sat, 18 Nov 2006) | 1 line Expand checking in test_sha ........ r52787 | georg.brandl | 2006-11-19 09:48:30 +0100 (Sun, 19 Nov 2006) | 3 lines Patch [ 1586791 ] better error msgs for some TypeErrors ........ r52788 | martin.v.loewis | 2006-11-19 11:41:41 +0100 (Sun, 19 Nov 2006) | 4 lines Make cStringIO.truncate raise IOError for negative arguments (even for -1). Fixes the last bit of #1359365. ........ r52789 | andrew.kuchling | 2006-11-19 19:40:01 +0100 (Sun, 19 Nov 2006) | 1 line Add a test case of data w/ bytes > 127 ........ r52790 | martin.v.loewis | 2006-11-19 19:51:54 +0100 (Sun, 19 Nov 2006) | 3 lines Patch #1070046: Marshal new-style objects like InstanceType in xmlrpclib. ........ r52792 | neal.norwitz | 2006-11-19 22:26:53 +0100 (Sun, 19 Nov 2006) | 4 lines Speed up function calls into the math module by using METH_O. There should be no functional changes. However, the error msgs are slightly different. Also verified that the module dict is not NULL on init. ........ r52794 | george.yoshida | 2006-11-20 03:24:48 +0100 (Mon, 20 Nov 2006) | 2 lines markup fix ........ r52795 | georg.brandl | 2006-11-20 08:12:58 +0100 (Mon, 20 Nov 2006) | 3 lines Further markup fix. ........ r52800 | andrew.kuchling | 2006-11-20 14:39:37 +0100 (Mon, 20 Nov 2006) | 2 lines Jython compatibility fix: if uu.decode() opened its output file, be sure to close it. ........ r52811 | neal.norwitz | 2006-11-21 06:26:22 +0100 (Tue, 21 Nov 2006) | 9 lines Bug #1599782: Fix segfault on bsddb.db.DB().type(). The problem is that _DB_get_type() can't be called without the GIL because it calls a bunch of PyErr_* APIs when an error occurs. There were no other cases in this file that it was called without the GIL. Removing the BEGIN/END THREAD around _DB_get_type() made everything work. Will backport. ........ r52814 | neal.norwitz | 2006-11-21 06:51:51 +0100 (Tue, 21 Nov 2006) | 1 line Oops, convert tabs to spaces ........ r52815 | neal.norwitz | 2006-11-21 07:23:44 +0100 (Tue, 21 Nov 2006) | 1 line Fix SF #1599879, socket.gethostname should ref getfqdn directly. ........ r52817 | martin.v.loewis | 2006-11-21 19:20:25 +0100 (Tue, 21 Nov 2006) | 4 lines Conditionalize definition of _CRT_SECURE_NO_DEPRECATE and _CRT_NONSTDC_NO_DEPRECATE. Will backport. ........ r52821 | martin.v.loewis | 2006-11-22 09:50:02 +0100 (Wed, 22 Nov 2006) | 4 lines Patch #1362975: Rework CodeContext indentation algorithm to avoid hard-coding pixel widths. Also make the text's scrollbar a child of the text frame, not the top widget. ........ r52826 | walter.doerwald | 2006-11-23 06:03:56 +0100 (Thu, 23 Nov 2006) | 3 lines Change decode() so that it works with a buffer (i.e. unicode(..., 'utf-8-sig')) SF bug #1601501. ........ r52833 | georg.brandl | 2006-11-23 10:55:07 +0100 (Thu, 23 Nov 2006) | 2 lines Bug #1601630: little improvement to getopt docs ........ r52835 | michael.hudson | 2006-11-23 14:54:04 +0100 (Thu, 23 Nov 2006) | 3 lines a test for an error condition not covered by existing tests (noticed this when writing the equivalent code for pypy) ........ r52839 | raymond.hettinger | 2006-11-23 22:06:03 +0100 (Thu, 23 Nov 2006) | 1 line Fix and/add typo ........ r52840 | raymond.hettinger | 2006-11-23 22:35:19 +0100 (Thu, 23 Nov 2006) | 1 line ... and the number of the counting shall be three. ........ r52841 | thomas.heller | 2006-11-24 19:45:39 +0100 (Fri, 24 Nov 2006) | 1 line Fix bug #1598620: A ctypes structure cannot contain itself. ........ r52843 | martin.v.loewis | 2006-11-25 16:39:19 +0100 (Sat, 25 Nov 2006) | 3 lines Disable _XOPEN_SOURCE on NetBSD 1.x. Will backport to 2.5 ........ r52845 | georg.brandl | 2006-11-26 20:27:47 +0100 (Sun, 26 Nov 2006) | 2 lines Bug #1603321: make pstats.Stats accept Unicode file paths. ........ r52850 | georg.brandl | 2006-11-27 19:46:21 +0100 (Mon, 27 Nov 2006) | 2 lines Bug #1603789: grammatical error in Tkinter docs. ........ r52855 | thomas.heller | 2006-11-28 21:21:54 +0100 (Tue, 28 Nov 2006) | 7 lines Fix #1563807: _ctypes built on AIX fails with ld ffi error. The contents of ffi_darwin.c must be compiled unless __APPLE__ is defined and __ppc__ is not. Will backport. ........ r52862 | armin.rigo | 2006-11-29 22:59:22 +0100 (Wed, 29 Nov 2006) | 3 lines Forgot a case where the locals can now be a general mapping instead of just a dictionary. (backporting...) ........ r52872 | guido.van.rossum | 2006-11-30 20:23:13 +0100 (Thu, 30 Nov 2006) | 2 lines Update version. ........ r52890 | walter.doerwald | 2006-12-01 17:59:47 +0100 (Fri, 01 Dec 2006) | 3 lines Move xdrlib tests from the module into a separate test script, port the tests to unittest and add a few new tests. ........ r52900 | raymond.hettinger | 2006-12-02 03:00:39 +0100 (Sat, 02 Dec 2006) | 1 line Add name to credits (for untokenize). ........ r52905 | martin.v.loewis | 2006-12-03 10:54:46 +0100 (Sun, 03 Dec 2006) | 2 lines Move IDLE news into NEWS.txt. ........ r52906 | martin.v.loewis | 2006-12-03 12:23:45 +0100 (Sun, 03 Dec 2006) | 4 lines Patch #1544279: Improve thread-safety of the socket module by moving the sock_addr_t storage out of the socket object. Will backport to 2.5. ........ r52908 | martin.v.loewis | 2006-12-03 13:01:53 +0100 (Sun, 03 Dec 2006) | 3 lines Patch #1371075: Make ConfigParser accept optional dict type for ordering, sorting, etc. ........ r52910 | matthias.klose | 2006-12-03 18:16:41 +0100 (Sun, 03 Dec 2006) | 2 lines - Fix build failure on kfreebsd and on the hurd. ........ r52915 | george.yoshida | 2006-12-04 12:41:54 +0100 (Mon, 04 Dec 2006) | 2 lines fix a versionchanged tag ........ r52917 | george.yoshida | 2006-12-05 06:39:50 +0100 (Tue, 05 Dec 2006) | 3 lines Fix pickle doc typo Patch #1608758 ........ r52938 | georg.brandl | 2006-12-06 23:21:18 +0100 (Wed, 06 Dec 2006) | 2 lines Patch #1610437: fix a tarfile bug with long filename headers. ........ r52945 | brett.cannon | 2006-12-07 00:38:48 +0100 (Thu, 07 Dec 2006) | 3 lines Fix a bad assumption that all objects assigned to '__loader__' on a module will have a '_files' attribute. ........ r52951 | georg.brandl | 2006-12-07 10:30:06 +0100 (Thu, 07 Dec 2006) | 3 lines RFE #1592899: mention string.maketrans() in docs for str.translate, remove reference to the old regex module in the former's doc. ........ r52962 | raymond.hettinger | 2006-12-08 04:17:18 +0100 (Fri, 08 Dec 2006) | 1 line Eliminate two redundant calls to PyObject_Hash(). ........ r52963 | raymond.hettinger | 2006-12-08 05:24:33 +0100 (Fri, 08 Dec 2006) | 3 lines Port Armin's fix for a dict resize vulnerability (svn revision 46589, sf bug 1456209). ........ r52964 | raymond.hettinger | 2006-12-08 05:57:50 +0100 (Fri, 08 Dec 2006) | 4 lines Port Georg's dictobject.c fix keys that were tuples got unpacked on the way to setting a KeyError (svn revision 52535, sf bug 1576657). ........ r52966 | raymond.hettinger | 2006-12-08 18:35:25 +0100 (Fri, 08 Dec 2006) | 2 lines Add test for SF bug 1576657 ........ r52970 | georg.brandl | 2006-12-08 21:46:11 +0100 (Fri, 08 Dec 2006) | 3 lines #1577756: svnversion doesn't react to LANG=C, use LC_ALL=C to force English output. ........ r52972 | georg.brandl | 2006-12-09 10:08:29 +0100 (Sat, 09 Dec 2006) | 3 lines Patch #1608267: fix a race condition in os.makedirs() is the directory to be created is already there. ........ r52975 | matthias.klose | 2006-12-09 13:15:27 +0100 (Sat, 09 Dec 2006) | 2 lines - Fix the build of the library reference in info format. ........ r52994 | neal.norwitz | 2006-12-11 02:01:06 +0100 (Mon, 11 Dec 2006) | 1 line Fix a typo ........ r52996 | georg.brandl | 2006-12-11 08:56:33 +0100 (Mon, 11 Dec 2006) | 2 lines Move errno imports back to individual functions. ........ r52998 | vinay.sajip | 2006-12-11 15:07:16 +0100 (Mon, 11 Dec 2006) | 1 line Patch by Jeremy Katz (SF #1609407) ........ r53000 | vinay.sajip | 2006-12-11 15:26:23 +0100 (Mon, 11 Dec 2006) | 1 line Patch by "cuppatea" (SF #1503765) ........
3157 lines
106 KiB
Python
3157 lines
106 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
|
|
|
|
# This module is currently Py2.3 compatible and should be kept that way
|
|
# unless a major compelling advantage arises. IOW, 2.3 compatibility is
|
|
# strongly preferred, but not guaranteed.
|
|
|
|
# Also, this module should be kept in sync with the latest updates of
|
|
# the IBM specification as it evolves. Those updates will be treated
|
|
# as bug fixes (deviation from the spec is a compatibility, usability
|
|
# bug) and will be backported. At this point the spec is stabilizing
|
|
# and the updates are becoming fewer, smaller, and less significant.
|
|
|
|
"""
|
|
This is a Py2.3 implementation of decimal floating point arithmetic based on
|
|
the General Decimal Arithmetic Specification:
|
|
|
|
www2.hursley.ibm.com/decimal/decarith.html
|
|
|
|
and IEEE standard 854-1987:
|
|
|
|
www.cs.berkeley.edu/~ejr/projects/754/private/drafts/854-1987/dir.html
|
|
|
|
Decimal floating point has finite precision with arbitrarily large bounds.
|
|
|
|
The purpose of the module is to support arithmetic using familiar
|
|
"schoolhouse" rules and to avoid the some of tricky representation
|
|
issues associated with binary floating point. The package is especially
|
|
useful for financial applications or for contexts where users have
|
|
expectations that are at odds with binary floating point (for instance,
|
|
in binary floating point, 1.00 % 0.1 gives 0.09999999999999995 instead
|
|
of the expected Decimal("0.00") returned by decimal floating point).
|
|
|
|
Here are some examples of using the decimal module:
|
|
|
|
>>> from decimal import *
|
|
>>> setcontext(ExtendedContext)
|
|
>>> Decimal(0)
|
|
Decimal("0")
|
|
>>> Decimal("1")
|
|
Decimal("1")
|
|
>>> Decimal("-.0123")
|
|
Decimal("-0.0123")
|
|
>>> Decimal(123456)
|
|
Decimal("123456")
|
|
>>> Decimal("123.45e12345678901234567890")
|
|
Decimal("1.2345E+12345678901234567892")
|
|
>>> Decimal("1.33") + Decimal("1.27")
|
|
Decimal("2.60")
|
|
>>> Decimal("12.34") + Decimal("3.87") - Decimal("18.41")
|
|
Decimal("-2.20")
|
|
>>> dig = Decimal(1)
|
|
>>> print dig / Decimal(3)
|
|
0.333333333
|
|
>>> getcontext().prec = 18
|
|
>>> print dig / Decimal(3)
|
|
0.333333333333333333
|
|
>>> print dig.sqrt()
|
|
1
|
|
>>> print Decimal(3).sqrt()
|
|
1.73205080756887729
|
|
>>> print Decimal(3) ** 123
|
|
4.85192780976896427E+58
|
|
>>> inf = Decimal(1) / Decimal(0)
|
|
>>> print inf
|
|
Infinity
|
|
>>> neginf = Decimal(-1) / Decimal(0)
|
|
>>> print neginf
|
|
-Infinity
|
|
>>> print neginf + inf
|
|
NaN
|
|
>>> print neginf * inf
|
|
-Infinity
|
|
>>> print dig / 0
|
|
Infinity
|
|
>>> getcontext().traps[DivisionByZero] = 1
|
|
>>> print dig / 0
|
|
Traceback (most recent call last):
|
|
...
|
|
...
|
|
...
|
|
decimal.DivisionByZero: x / 0
|
|
>>> c = Context()
|
|
>>> c.traps[InvalidOperation] = 0
|
|
>>> print c.flags[InvalidOperation]
|
|
0
|
|
>>> c.divide(Decimal(0), Decimal(0))
|
|
Decimal("NaN")
|
|
>>> c.traps[InvalidOperation] = 1
|
|
>>> print c.flags[InvalidOperation]
|
|
1
|
|
>>> c.flags[InvalidOperation] = 0
|
|
>>> print c.flags[InvalidOperation]
|
|
0
|
|
>>> print c.divide(Decimal(0), Decimal(0))
|
|
Traceback (most recent call last):
|
|
...
|
|
...
|
|
...
|
|
decimal.InvalidOperation: 0 / 0
|
|
>>> print c.flags[InvalidOperation]
|
|
1
|
|
>>> c.flags[InvalidOperation] = 0
|
|
>>> c.traps[InvalidOperation] = 0
|
|
>>> print c.divide(Decimal(0), Decimal(0))
|
|
NaN
|
|
>>> print c.flags[InvalidOperation]
|
|
1
|
|
>>>
|
|
"""
|
|
|
|
__all__ = [
|
|
# Two major classes
|
|
'Decimal', 'Context',
|
|
|
|
# Contexts
|
|
'DefaultContext', 'BasicContext', 'ExtendedContext',
|
|
|
|
# Exceptions
|
|
'DecimalException', 'Clamped', 'InvalidOperation', 'DivisionByZero',
|
|
'Inexact', 'Rounded', 'Subnormal', 'Overflow', 'Underflow',
|
|
|
|
# Constants for use in setting up contexts
|
|
'ROUND_DOWN', 'ROUND_HALF_UP', 'ROUND_HALF_EVEN', 'ROUND_CEILING',
|
|
'ROUND_FLOOR', 'ROUND_UP', 'ROUND_HALF_DOWN',
|
|
|
|
# Functions for manipulating contexts
|
|
'setcontext', 'getcontext', 'localcontext'
|
|
]
|
|
|
|
import copy as _copy
|
|
|
|
#Rounding
|
|
ROUND_DOWN = 'ROUND_DOWN'
|
|
ROUND_HALF_UP = 'ROUND_HALF_UP'
|
|
ROUND_HALF_EVEN = 'ROUND_HALF_EVEN'
|
|
ROUND_CEILING = 'ROUND_CEILING'
|
|
ROUND_FLOOR = 'ROUND_FLOOR'
|
|
ROUND_UP = 'ROUND_UP'
|
|
ROUND_HALF_DOWN = 'ROUND_HALF_DOWN'
|
|
|
|
#Rounding decision (not part of the public API)
|
|
NEVER_ROUND = 'NEVER_ROUND' # Round in division (non-divmod), sqrt ONLY
|
|
ALWAYS_ROUND = 'ALWAYS_ROUND' # Every operation rounds at end.
|
|
|
|
#Errors
|
|
|
|
class DecimalException(ArithmeticError):
|
|
"""Base exception class.
|
|
|
|
Used exceptions derive from this.
|
|
If an exception derives from another exception besides this (such as
|
|
Underflow (Inexact, Rounded, Subnormal) that indicates that it is only
|
|
called if the others are present. This isn't actually used for
|
|
anything, though.
|
|
|
|
handle -- Called when context._raise_error is called and the
|
|
trap_enabler is set. First argument is self, second is the
|
|
context. More arguments can be given, those being after
|
|
the explanation in _raise_error (For example,
|
|
context._raise_error(NewError, '(-x)!', self._sign) would
|
|
call NewError().handle(context, self._sign).)
|
|
|
|
To define a new exception, it should be sufficient to have it derive
|
|
from DecimalException.
|
|
"""
|
|
def handle(self, context, *args):
|
|
pass
|
|
|
|
|
|
class Clamped(DecimalException):
|
|
"""Exponent of a 0 changed to fit bounds.
|
|
|
|
This occurs and signals clamped if the exponent of a result has been
|
|
altered in order to fit the constraints of a specific concrete
|
|
representation. This may occur when the exponent of a zero result would
|
|
be outside the bounds of a representation, or when a large normal
|
|
number would have an encoded exponent that cannot be represented. In
|
|
this latter case, the exponent is reduced to fit and the corresponding
|
|
number of zero digits are appended to the coefficient ("fold-down").
|
|
"""
|
|
|
|
|
|
class InvalidOperation(DecimalException):
|
|
"""An invalid operation was performed.
|
|
|
|
Various bad things cause this:
|
|
|
|
Something creates a signaling NaN
|
|
-INF + INF
|
|
0 * (+-)INF
|
|
(+-)INF / (+-)INF
|
|
x % 0
|
|
(+-)INF % x
|
|
x._rescale( non-integer )
|
|
sqrt(-x) , x > 0
|
|
0 ** 0
|
|
x ** (non-integer)
|
|
x ** (+-)INF
|
|
An operand is invalid
|
|
"""
|
|
def handle(self, context, *args):
|
|
if args:
|
|
if args[0] == 1: #sNaN, must drop 's' but keep diagnostics
|
|
return Decimal( (args[1]._sign, args[1]._int, 'n') )
|
|
return NaN
|
|
|
|
class ConversionSyntax(InvalidOperation):
|
|
"""Trying to convert badly formed string.
|
|
|
|
This occurs and signals invalid-operation if an string is being
|
|
converted to a number and it does not conform to the numeric string
|
|
syntax. The result is [0,qNaN].
|
|
"""
|
|
|
|
def handle(self, context, *args):
|
|
return (0, (0,), 'n') #Passed to something which uses a tuple.
|
|
|
|
class DivisionByZero(DecimalException, ZeroDivisionError):
|
|
"""Division by 0.
|
|
|
|
This occurs and signals division-by-zero if division of a finite number
|
|
by zero was attempted (during a divide-integer or divide operation, or a
|
|
power operation with negative right-hand operand), and the dividend was
|
|
not zero.
|
|
|
|
The result of the operation is [sign,inf], where sign is the exclusive
|
|
or of the signs of the operands for divide, or is 1 for an odd power of
|
|
-0, for power.
|
|
"""
|
|
|
|
def handle(self, context, sign, double = None, *args):
|
|
if double is not None:
|
|
return (Infsign[sign],)*2
|
|
return Infsign[sign]
|
|
|
|
class DivisionImpossible(InvalidOperation):
|
|
"""Cannot perform the division adequately.
|
|
|
|
This occurs and signals invalid-operation if the integer result of a
|
|
divide-integer or remainder operation had too many digits (would be
|
|
longer than precision). The result is [0,qNaN].
|
|
"""
|
|
|
|
def handle(self, context, *args):
|
|
return (NaN, NaN)
|
|
|
|
class DivisionUndefined(InvalidOperation, ZeroDivisionError):
|
|
"""Undefined result of division.
|
|
|
|
This occurs and signals invalid-operation if division by zero was
|
|
attempted (during a divide-integer, divide, or remainder operation), and
|
|
the dividend is also zero. The result is [0,qNaN].
|
|
"""
|
|
|
|
def handle(self, context, tup=None, *args):
|
|
if tup is not None:
|
|
return (NaN, NaN) #for 0 %0, 0 // 0
|
|
return NaN
|
|
|
|
class Inexact(DecimalException):
|
|
"""Had to round, losing information.
|
|
|
|
This occurs and signals inexact whenever the result of an operation is
|
|
not exact (that is, it needed to be rounded and any discarded digits
|
|
were non-zero), or if an overflow or underflow condition occurs. The
|
|
result in all cases is unchanged.
|
|
|
|
The inexact signal may be tested (or trapped) to determine if a given
|
|
operation (or sequence of operations) was inexact.
|
|
"""
|
|
pass
|
|
|
|
class InvalidContext(InvalidOperation):
|
|
"""Invalid context. Unknown rounding, for example.
|
|
|
|
This occurs and signals invalid-operation if an invalid context was
|
|
detected during an operation. This can occur if contexts are not checked
|
|
on creation and either the precision exceeds the capability of the
|
|
underlying concrete representation or an unknown or unsupported rounding
|
|
was specified. These aspects of the context need only be checked when
|
|
the values are required to be used. The result is [0,qNaN].
|
|
"""
|
|
|
|
def handle(self, context, *args):
|
|
return NaN
|
|
|
|
class Rounded(DecimalException):
|
|
"""Number got rounded (not necessarily changed during rounding).
|
|
|
|
This occurs and signals rounded whenever the result of an operation is
|
|
rounded (that is, some zero or non-zero digits were discarded from the
|
|
coefficient), or if an overflow or underflow condition occurs. The
|
|
result in all cases is unchanged.
|
|
|
|
The rounded signal may be tested (or trapped) to determine if a given
|
|
operation (or sequence of operations) caused a loss of precision.
|
|
"""
|
|
pass
|
|
|
|
class Subnormal(DecimalException):
|
|
"""Exponent < Emin before rounding.
|
|
|
|
This occurs and signals subnormal whenever the result of a conversion or
|
|
operation is subnormal (that is, its adjusted exponent is less than
|
|
Emin, before any rounding). The result in all cases is unchanged.
|
|
|
|
The subnormal signal may be tested (or trapped) to determine if a given
|
|
or operation (or sequence of operations) yielded a subnormal result.
|
|
"""
|
|
pass
|
|
|
|
class Overflow(Inexact, Rounded):
|
|
"""Numerical overflow.
|
|
|
|
This occurs and signals overflow if the adjusted exponent of a result
|
|
(from a conversion or from an operation that is not an attempt to divide
|
|
by zero), after rounding, would be greater than the largest value that
|
|
can be handled by the implementation (the value Emax).
|
|
|
|
The result depends on the rounding mode:
|
|
|
|
For round-half-up and round-half-even (and for round-half-down and
|
|
round-up, if implemented), the result of the operation is [sign,inf],
|
|
where sign is the sign of the intermediate result. For round-down, the
|
|
result is the largest finite number that can be represented in the
|
|
current precision, with the sign of the intermediate result. For
|
|
round-ceiling, the result is the same as for round-down if the sign of
|
|
the intermediate result is 1, or is [0,inf] otherwise. For round-floor,
|
|
the result is the same as for round-down if the sign of the intermediate
|
|
result is 0, or is [1,inf] otherwise. In all cases, Inexact and Rounded
|
|
will also be raised.
|
|
"""
|
|
|
|
def handle(self, context, sign, *args):
|
|
if context.rounding in (ROUND_HALF_UP, ROUND_HALF_EVEN,
|
|
ROUND_HALF_DOWN, ROUND_UP):
|
|
return Infsign[sign]
|
|
if sign == 0:
|
|
if context.rounding == ROUND_CEILING:
|
|
return Infsign[sign]
|
|
return Decimal((sign, (9,)*context.prec,
|
|
context.Emax-context.prec+1))
|
|
if sign == 1:
|
|
if context.rounding == ROUND_FLOOR:
|
|
return Infsign[sign]
|
|
return Decimal( (sign, (9,)*context.prec,
|
|
context.Emax-context.prec+1))
|
|
|
|
|
|
class Underflow(Inexact, Rounded, Subnormal):
|
|
"""Numerical underflow with result rounded to 0.
|
|
|
|
This occurs and signals underflow if a result is inexact and the
|
|
adjusted exponent of the result would be smaller (more negative) than
|
|
the smallest value that can be handled by the implementation (the value
|
|
Emin). That is, the result is both inexact and subnormal.
|
|
|
|
The result after an underflow will be a subnormal number rounded, if
|
|
necessary, so that its exponent is not less than Etiny. This may result
|
|
in 0 with the sign of the intermediate result and an exponent of Etiny.
|
|
|
|
In all cases, Inexact, Rounded, and Subnormal will also be raised.
|
|
"""
|
|
|
|
# List of public traps and flags
|
|
_signals = [Clamped, DivisionByZero, Inexact, Overflow, Rounded,
|
|
Underflow, InvalidOperation, Subnormal]
|
|
|
|
# Map conditions (per the spec) to signals
|
|
_condition_map = {ConversionSyntax:InvalidOperation,
|
|
DivisionImpossible:InvalidOperation,
|
|
DivisionUndefined:InvalidOperation,
|
|
InvalidContext:InvalidOperation}
|
|
|
|
##### Context Functions #######################################
|
|
|
|
# The getcontext() and setcontext() function manage access to a thread-local
|
|
# current context. Py2.4 offers direct support for thread locals. If that
|
|
# is not available, use threading.currentThread() which is slower but will
|
|
# work for older Pythons. If threads are not part of the build, create a
|
|
# mock threading object with threading.local() returning the module namespace.
|
|
|
|
try:
|
|
import threading
|
|
except ImportError:
|
|
# Python was compiled without threads; create a mock object instead
|
|
import sys
|
|
class MockThreading:
|
|
def local(self, sys=sys):
|
|
return sys.modules[__name__]
|
|
threading = MockThreading()
|
|
del sys, MockThreading
|
|
|
|
try:
|
|
threading.local
|
|
|
|
except AttributeError:
|
|
|
|
#To fix reloading, force it to create a new context
|
|
#Old contexts have different exceptions in their dicts, making problems.
|
|
if hasattr(threading.currentThread(), '__decimal_context__'):
|
|
del threading.currentThread().__decimal_context__
|
|
|
|
def setcontext(context):
|
|
"""Set this thread's context to context."""
|
|
if context in (DefaultContext, BasicContext, ExtendedContext):
|
|
context = context.copy()
|
|
context.clear_flags()
|
|
threading.currentThread().__decimal_context__ = context
|
|
|
|
def getcontext():
|
|
"""Returns this thread's context.
|
|
|
|
If this thread does not yet have a context, returns
|
|
a new context and sets this thread's context.
|
|
New contexts are copies of DefaultContext.
|
|
"""
|
|
try:
|
|
return threading.currentThread().__decimal_context__
|
|
except AttributeError:
|
|
context = Context()
|
|
threading.currentThread().__decimal_context__ = context
|
|
return context
|
|
|
|
else:
|
|
|
|
local = threading.local()
|
|
if hasattr(local, '__decimal_context__'):
|
|
del local.__decimal_context__
|
|
|
|
def getcontext(_local=local):
|
|
"""Returns this thread's context.
|
|
|
|
If this thread does not yet have a context, returns
|
|
a new context and sets this thread's context.
|
|
New contexts are copies of DefaultContext.
|
|
"""
|
|
try:
|
|
return _local.__decimal_context__
|
|
except AttributeError:
|
|
context = Context()
|
|
_local.__decimal_context__ = context
|
|
return context
|
|
|
|
def setcontext(context, _local=local):
|
|
"""Set this thread's context to context."""
|
|
if context in (DefaultContext, BasicContext, ExtendedContext):
|
|
context = context.copy()
|
|
context.clear_flags()
|
|
_local.__decimal_context__ = context
|
|
|
|
del threading, local # Don't contaminate the namespace
|
|
|
|
def localcontext(ctx=None):
|
|
"""Return a context manager for a copy of the supplied context
|
|
|
|
Uses a copy of the current context if no context is specified
|
|
The returned context manager creates a local decimal context
|
|
in a with statement:
|
|
def sin(x):
|
|
with localcontext() as ctx:
|
|
ctx.prec += 2
|
|
# Rest of sin calculation algorithm
|
|
# uses a precision 2 greater than normal
|
|
return +s # Convert result to normal precision
|
|
|
|
def sin(x):
|
|
with localcontext(ExtendedContext):
|
|
# Rest of sin calculation algorithm
|
|
# uses the Extended Context from the
|
|
# General Decimal Arithmetic Specification
|
|
return +s # Convert result to normal context
|
|
|
|
"""
|
|
# The string below can't be included in the docstring until Python 2.6
|
|
# as the doctest module doesn't understand __future__ statements
|
|
"""
|
|
>>> from __future__ import with_statement
|
|
>>> print getcontext().prec
|
|
28
|
|
>>> with localcontext():
|
|
... ctx = getcontext()
|
|
... ctx.prec() += 2
|
|
... print ctx.prec
|
|
...
|
|
30
|
|
>>> with localcontext(ExtendedContext):
|
|
... print getcontext().prec
|
|
...
|
|
9
|
|
>>> print getcontext().prec
|
|
28
|
|
"""
|
|
if ctx is None: ctx = getcontext()
|
|
return _ContextManager(ctx)
|
|
|
|
|
|
##### Decimal class ###########################################
|
|
|
|
class Decimal(object):
|
|
"""Floating point class for decimal arithmetic."""
|
|
|
|
__slots__ = ('_exp','_int','_sign', '_is_special')
|
|
# Generally, the value of the Decimal instance is given by
|
|
# (-1)**_sign * _int * 10**_exp
|
|
# Special values are signified by _is_special == True
|
|
|
|
# We're immutable, so use __new__ not __init__
|
|
def __new__(cls, value="0", context=None):
|
|
"""Create a decimal point instance.
|
|
|
|
>>> Decimal('3.14') # string input
|
|
Decimal("3.14")
|
|
>>> Decimal((0, (3, 1, 4), -2)) # tuple input (sign, digit_tuple, exponent)
|
|
Decimal("3.14")
|
|
>>> Decimal(314) # int or long
|
|
Decimal("314")
|
|
>>> Decimal(Decimal(314)) # another decimal instance
|
|
Decimal("314")
|
|
"""
|
|
|
|
self = object.__new__(cls)
|
|
self._is_special = False
|
|
|
|
# From an internal working value
|
|
if isinstance(value, _WorkRep):
|
|
self._sign = value.sign
|
|
self._int = tuple(map(int, str(value.int)))
|
|
self._exp = int(value.exp)
|
|
return self
|
|
|
|
# From another decimal
|
|
if isinstance(value, Decimal):
|
|
self._exp = value._exp
|
|
self._sign = value._sign
|
|
self._int = value._int
|
|
self._is_special = value._is_special
|
|
return self
|
|
|
|
# From an integer
|
|
if isinstance(value, (int,long)):
|
|
if value >= 0:
|
|
self._sign = 0
|
|
else:
|
|
self._sign = 1
|
|
self._exp = 0
|
|
self._int = tuple(map(int, str(abs(value))))
|
|
return self
|
|
|
|
# tuple/list conversion (possibly from as_tuple())
|
|
if isinstance(value, (list,tuple)):
|
|
if len(value) != 3:
|
|
raise ValueError, 'Invalid arguments'
|
|
if value[0] not in (0,1):
|
|
raise ValueError, 'Invalid sign'
|
|
for digit in value[1]:
|
|
if not isinstance(digit, (int,long)) or digit < 0:
|
|
raise ValueError, "The second value in the tuple must be composed of non negative integer elements."
|
|
|
|
self._sign = value[0]
|
|
self._int = tuple(value[1])
|
|
if value[2] in ('F','n','N'):
|
|
self._exp = value[2]
|
|
self._is_special = True
|
|
else:
|
|
self._exp = int(value[2])
|
|
return self
|
|
|
|
if isinstance(value, float):
|
|
raise TypeError("Cannot convert float to Decimal. " +
|
|
"First convert the float to a string")
|
|
|
|
# Other argument types may require the context during interpretation
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
# From a string
|
|
# REs insist on real strings, so we can too.
|
|
if isinstance(value, basestring):
|
|
if _isinfinity(value):
|
|
self._exp = 'F'
|
|
self._int = (0,)
|
|
self._is_special = True
|
|
if _isinfinity(value) == 1:
|
|
self._sign = 0
|
|
else:
|
|
self._sign = 1
|
|
return self
|
|
if _isnan(value):
|
|
sig, sign, diag = _isnan(value)
|
|
self._is_special = True
|
|
if len(diag) > context.prec: #Diagnostic info too long
|
|
self._sign, self._int, self._exp = \
|
|
context._raise_error(ConversionSyntax)
|
|
return self
|
|
if sig == 1:
|
|
self._exp = 'n' #qNaN
|
|
else: #sig == 2
|
|
self._exp = 'N' #sNaN
|
|
self._sign = sign
|
|
self._int = tuple(map(int, diag)) #Diagnostic info
|
|
return self
|
|
try:
|
|
self._sign, self._int, self._exp = _string2exact(value)
|
|
except ValueError:
|
|
self._is_special = True
|
|
self._sign, self._int, self._exp = context._raise_error(ConversionSyntax)
|
|
return self
|
|
|
|
raise TypeError("Cannot convert %r to Decimal" % value)
|
|
|
|
def _isnan(self):
|
|
"""Returns whether the number is not actually one.
|
|
|
|
0 if a number
|
|
1 if NaN
|
|
2 if sNaN
|
|
"""
|
|
if self._is_special:
|
|
exp = self._exp
|
|
if exp == 'n':
|
|
return 1
|
|
elif exp == 'N':
|
|
return 2
|
|
return 0
|
|
|
|
def _isinfinity(self):
|
|
"""Returns whether the number is infinite
|
|
|
|
0 if finite or not a number
|
|
1 if +INF
|
|
-1 if -INF
|
|
"""
|
|
if self._exp == 'F':
|
|
if self._sign:
|
|
return -1
|
|
return 1
|
|
return 0
|
|
|
|
def _check_nans(self, other = None, context=None):
|
|
"""Returns whether the number is not actually one.
|
|
|
|
if self, other are sNaN, signal
|
|
if self, other are NaN return nan
|
|
return 0
|
|
|
|
Done before operations.
|
|
"""
|
|
|
|
self_is_nan = self._isnan()
|
|
if other is None:
|
|
other_is_nan = False
|
|
else:
|
|
other_is_nan = other._isnan()
|
|
|
|
if self_is_nan or other_is_nan:
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
if self_is_nan == 2:
|
|
return context._raise_error(InvalidOperation, 'sNaN',
|
|
1, self)
|
|
if other_is_nan == 2:
|
|
return context._raise_error(InvalidOperation, 'sNaN',
|
|
1, other)
|
|
if self_is_nan:
|
|
return self
|
|
|
|
return other
|
|
return 0
|
|
|
|
def __bool__(self):
|
|
"""return True if the number is non-zero.
|
|
|
|
False if self == 0
|
|
True if self != 0
|
|
"""
|
|
if self._is_special:
|
|
return True
|
|
return sum(self._int) != 0
|
|
|
|
def __cmp__(self, other, context=None):
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
|
|
if self._is_special or other._is_special:
|
|
ans = self._check_nans(other, context)
|
|
if ans:
|
|
return 1 # Comparison involving NaN's always reports self > other
|
|
|
|
# INF = INF
|
|
return cmp(self._isinfinity(), other._isinfinity())
|
|
|
|
if not self and not other:
|
|
return 0 #If both 0, sign comparison isn't certain.
|
|
|
|
#If different signs, neg one is less
|
|
if other._sign < self._sign:
|
|
return -1
|
|
if self._sign < other._sign:
|
|
return 1
|
|
|
|
self_adjusted = self.adjusted()
|
|
other_adjusted = other.adjusted()
|
|
if self_adjusted == other_adjusted and \
|
|
self._int + (0,)*(self._exp - other._exp) == \
|
|
other._int + (0,)*(other._exp - self._exp):
|
|
return 0 #equal, except in precision. ([0]*(-x) = [])
|
|
elif self_adjusted > other_adjusted and self._int[0] != 0:
|
|
return (-1)**self._sign
|
|
elif self_adjusted < other_adjusted and other._int[0] != 0:
|
|
return -((-1)**self._sign)
|
|
|
|
# Need to round, so make sure we have a valid context
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
context = context._shallow_copy()
|
|
rounding = context._set_rounding(ROUND_UP) #round away from 0
|
|
|
|
flags = context._ignore_all_flags()
|
|
res = self.__sub__(other, context=context)
|
|
|
|
context._regard_flags(*flags)
|
|
|
|
context.rounding = rounding
|
|
|
|
if not res:
|
|
return 0
|
|
elif res._sign:
|
|
return -1
|
|
return 1
|
|
|
|
def __eq__(self, other):
|
|
if not isinstance(other, (Decimal, int, long)):
|
|
return NotImplemented
|
|
return self.__cmp__(other) == 0
|
|
|
|
def __ne__(self, other):
|
|
if not isinstance(other, (Decimal, int, long)):
|
|
return NotImplemented
|
|
return self.__cmp__(other) != 0
|
|
|
|
def __lt__(self, other):
|
|
if not isinstance(other, (Decimal, int, long)):
|
|
return NotImplemented
|
|
return self.__cmp__(other) < 0
|
|
|
|
def __le__(self, other):
|
|
if not isinstance(other, (Decimal, int, long)):
|
|
return NotImplemented
|
|
return self.__cmp__(other) <= 0
|
|
|
|
def __gt__(self, other):
|
|
if not isinstance(other, (Decimal, int, long)):
|
|
return NotImplemented
|
|
return self.__cmp__(other) > 0
|
|
|
|
def __ge__(self, other):
|
|
if not isinstance(other, (Decimal, int, long)):
|
|
return NotImplemented
|
|
return self.__cmp__(other) >= 0
|
|
|
|
def compare(self, other, context=None):
|
|
"""Compares one to another.
|
|
|
|
-1 => a < b
|
|
0 => a = b
|
|
1 => a > b
|
|
NaN => one is NaN
|
|
Like __cmp__, but returns Decimal instances.
|
|
"""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
|
|
#compare(NaN, NaN) = NaN
|
|
if (self._is_special or other and other._is_special):
|
|
ans = self._check_nans(other, context)
|
|
if ans:
|
|
return ans
|
|
|
|
return Decimal(self.__cmp__(other, context))
|
|
|
|
def __hash__(self):
|
|
"""x.__hash__() <==> hash(x)"""
|
|
# Decimal integers must hash the same as the ints
|
|
# Non-integer decimals are normalized and hashed as strings
|
|
# Normalization assures that hash(100E-1) == hash(10)
|
|
if self._is_special:
|
|
if self._isnan():
|
|
raise TypeError('Cannot hash a NaN value.')
|
|
return hash(str(self))
|
|
i = int(self)
|
|
if self == Decimal(i):
|
|
return hash(i)
|
|
assert self.__bool__() # '-0' handled by integer case
|
|
return hash(str(self.normalize()))
|
|
|
|
def as_tuple(self):
|
|
"""Represents the number as a triple tuple.
|
|
|
|
To show the internals exactly as they are.
|
|
"""
|
|
return (self._sign, self._int, self._exp)
|
|
|
|
def __repr__(self):
|
|
"""Represents the number as an instance of Decimal."""
|
|
# Invariant: eval(repr(d)) == d
|
|
return 'Decimal("%s")' % str(self)
|
|
|
|
def __str__(self, eng = 0, context=None):
|
|
"""Return string representation of the number in scientific notation.
|
|
|
|
Captures all of the information in the underlying representation.
|
|
"""
|
|
|
|
if self._is_special:
|
|
if self._isnan():
|
|
minus = '-'*self._sign
|
|
if self._int == (0,):
|
|
info = ''
|
|
else:
|
|
info = ''.join(map(str, self._int))
|
|
if self._isnan() == 2:
|
|
return minus + 'sNaN' + info
|
|
return minus + 'NaN' + info
|
|
if self._isinfinity():
|
|
minus = '-'*self._sign
|
|
return minus + 'Infinity'
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
tmp = map(str, self._int)
|
|
numdigits = len(self._int)
|
|
leftdigits = self._exp + numdigits
|
|
if eng and not self: #self = 0eX wants 0[.0[0]]eY, not [[0]0]0eY
|
|
if self._exp < 0 and self._exp >= -6: #short, no need for e/E
|
|
s = '-'*self._sign + '0.' + '0'*(abs(self._exp))
|
|
return s
|
|
#exp is closest mult. of 3 >= self._exp
|
|
exp = ((self._exp - 1)// 3 + 1) * 3
|
|
if exp != self._exp:
|
|
s = '0.'+'0'*(exp - self._exp)
|
|
else:
|
|
s = '0'
|
|
if exp != 0:
|
|
if context.capitals:
|
|
s += 'E'
|
|
else:
|
|
s += 'e'
|
|
if exp > 0:
|
|
s += '+' #0.0e+3, not 0.0e3
|
|
s += str(exp)
|
|
s = '-'*self._sign + s
|
|
return s
|
|
if eng:
|
|
dotplace = (leftdigits-1)%3+1
|
|
adjexp = leftdigits -1 - (leftdigits-1)%3
|
|
else:
|
|
adjexp = leftdigits-1
|
|
dotplace = 1
|
|
if self._exp == 0:
|
|
pass
|
|
elif self._exp < 0 and adjexp >= 0:
|
|
tmp.insert(leftdigits, '.')
|
|
elif self._exp < 0 and adjexp >= -6:
|
|
tmp[0:0] = ['0'] * int(-leftdigits)
|
|
tmp.insert(0, '0.')
|
|
else:
|
|
if numdigits > dotplace:
|
|
tmp.insert(dotplace, '.')
|
|
elif numdigits < dotplace:
|
|
tmp.extend(['0']*(dotplace-numdigits))
|
|
if adjexp:
|
|
if not context.capitals:
|
|
tmp.append('e')
|
|
else:
|
|
tmp.append('E')
|
|
if adjexp > 0:
|
|
tmp.append('+')
|
|
tmp.append(str(adjexp))
|
|
if eng:
|
|
while tmp[0:1] == ['0']:
|
|
tmp[0:1] = []
|
|
if len(tmp) == 0 or tmp[0] == '.' or tmp[0].lower() == 'e':
|
|
tmp[0:0] = ['0']
|
|
if self._sign:
|
|
tmp.insert(0, '-')
|
|
|
|
return ''.join(tmp)
|
|
|
|
def to_eng_string(self, context=None):
|
|
"""Convert to engineering-type string.
|
|
|
|
Engineering notation has an exponent which is a multiple of 3, so there
|
|
are up to 3 digits left of the decimal place.
|
|
|
|
Same rules for when in exponential and when as a value as in __str__.
|
|
"""
|
|
return self.__str__(eng=1, context=context)
|
|
|
|
def __neg__(self, context=None):
|
|
"""Returns a copy with the sign switched.
|
|
|
|
Rounds, if it has reason.
|
|
"""
|
|
if self._is_special:
|
|
ans = self._check_nans(context=context)
|
|
if ans:
|
|
return ans
|
|
|
|
if not self:
|
|
# -Decimal('0') is Decimal('0'), not Decimal('-0')
|
|
sign = 0
|
|
elif self._sign:
|
|
sign = 0
|
|
else:
|
|
sign = 1
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
if context._rounding_decision == ALWAYS_ROUND:
|
|
return Decimal((sign, self._int, self._exp))._fix(context)
|
|
return Decimal( (sign, self._int, self._exp))
|
|
|
|
def __pos__(self, context=None):
|
|
"""Returns a copy, unless it is a sNaN.
|
|
|
|
Rounds the number (if more then precision digits)
|
|
"""
|
|
if self._is_special:
|
|
ans = self._check_nans(context=context)
|
|
if ans:
|
|
return ans
|
|
|
|
sign = self._sign
|
|
if not self:
|
|
# + (-0) = 0
|
|
sign = 0
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
if context._rounding_decision == ALWAYS_ROUND:
|
|
ans = self._fix(context)
|
|
else:
|
|
ans = Decimal(self)
|
|
ans._sign = sign
|
|
return ans
|
|
|
|
def __abs__(self, round=1, context=None):
|
|
"""Returns the absolute value of self.
|
|
|
|
If the second argument is 0, do not round.
|
|
"""
|
|
if self._is_special:
|
|
ans = self._check_nans(context=context)
|
|
if ans:
|
|
return ans
|
|
|
|
if not round:
|
|
if context is None:
|
|
context = getcontext()
|
|
context = context._shallow_copy()
|
|
context._set_rounding_decision(NEVER_ROUND)
|
|
|
|
if self._sign:
|
|
ans = self.__neg__(context=context)
|
|
else:
|
|
ans = self.__pos__(context=context)
|
|
|
|
return ans
|
|
|
|
def __add__(self, other, context=None):
|
|
"""Returns self + other.
|
|
|
|
-INF + INF (or the reverse) cause InvalidOperation errors.
|
|
"""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
if self._is_special or other._is_special:
|
|
ans = self._check_nans(other, context)
|
|
if ans:
|
|
return ans
|
|
|
|
if self._isinfinity():
|
|
#If both INF, same sign => same as both, opposite => error.
|
|
if self._sign != other._sign and other._isinfinity():
|
|
return context._raise_error(InvalidOperation, '-INF + INF')
|
|
return Decimal(self)
|
|
if other._isinfinity():
|
|
return Decimal(other) #Can't both be infinity here
|
|
|
|
shouldround = context._rounding_decision == ALWAYS_ROUND
|
|
|
|
exp = min(self._exp, other._exp)
|
|
negativezero = 0
|
|
if context.rounding == ROUND_FLOOR and self._sign != other._sign:
|
|
#If the answer is 0, the sign should be negative, in this case.
|
|
negativezero = 1
|
|
|
|
if not self and not other:
|
|
sign = min(self._sign, other._sign)
|
|
if negativezero:
|
|
sign = 1
|
|
return Decimal( (sign, (0,), exp))
|
|
if not self:
|
|
exp = max(exp, other._exp - context.prec-1)
|
|
ans = other._rescale(exp, watchexp=0, context=context)
|
|
if shouldround:
|
|
ans = ans._fix(context)
|
|
return ans
|
|
if not other:
|
|
exp = max(exp, self._exp - context.prec-1)
|
|
ans = self._rescale(exp, watchexp=0, context=context)
|
|
if shouldround:
|
|
ans = ans._fix(context)
|
|
return ans
|
|
|
|
op1 = _WorkRep(self)
|
|
op2 = _WorkRep(other)
|
|
op1, op2 = _normalize(op1, op2, shouldround, context.prec)
|
|
|
|
result = _WorkRep()
|
|
if op1.sign != op2.sign:
|
|
# Equal and opposite
|
|
if op1.int == op2.int:
|
|
if exp < context.Etiny():
|
|
exp = context.Etiny()
|
|
context._raise_error(Clamped)
|
|
return Decimal((negativezero, (0,), exp))
|
|
if op1.int < op2.int:
|
|
op1, op2 = op2, op1
|
|
#OK, now abs(op1) > abs(op2)
|
|
if op1.sign == 1:
|
|
result.sign = 1
|
|
op1.sign, op2.sign = op2.sign, op1.sign
|
|
else:
|
|
result.sign = 0
|
|
#So we know the sign, and op1 > 0.
|
|
elif op1.sign == 1:
|
|
result.sign = 1
|
|
op1.sign, op2.sign = (0, 0)
|
|
else:
|
|
result.sign = 0
|
|
#Now, op1 > abs(op2) > 0
|
|
|
|
if op2.sign == 0:
|
|
result.int = op1.int + op2.int
|
|
else:
|
|
result.int = op1.int - op2.int
|
|
|
|
result.exp = op1.exp
|
|
ans = Decimal(result)
|
|
if shouldround:
|
|
ans = ans._fix(context)
|
|
return ans
|
|
|
|
__radd__ = __add__
|
|
|
|
def __sub__(self, other, context=None):
|
|
"""Return self + (-other)"""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
|
|
if self._is_special or other._is_special:
|
|
ans = self._check_nans(other, context=context)
|
|
if ans:
|
|
return ans
|
|
|
|
# -Decimal(0) = Decimal(0), which we don't want since
|
|
# (-0 - 0 = -0 + (-0) = -0, but -0 + 0 = 0.)
|
|
# so we change the sign directly to a copy
|
|
tmp = Decimal(other)
|
|
tmp._sign = 1-tmp._sign
|
|
|
|
return self.__add__(tmp, context=context)
|
|
|
|
def __rsub__(self, other, context=None):
|
|
"""Return other + (-self)"""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
|
|
tmp = Decimal(self)
|
|
tmp._sign = 1 - tmp._sign
|
|
return other.__add__(tmp, context=context)
|
|
|
|
def _increment(self, round=1, context=None):
|
|
"""Special case of add, adding 1eExponent
|
|
|
|
Since it is common, (rounding, for example) this adds
|
|
(sign)*one E self._exp to the number more efficiently than add.
|
|
|
|
For example:
|
|
Decimal('5.624e10')._increment() == Decimal('5.625e10')
|
|
"""
|
|
if self._is_special:
|
|
ans = self._check_nans(context=context)
|
|
if ans:
|
|
return ans
|
|
|
|
return Decimal(self) # Must be infinite, and incrementing makes no difference
|
|
|
|
L = list(self._int)
|
|
L[-1] += 1
|
|
spot = len(L)-1
|
|
while L[spot] == 10:
|
|
L[spot] = 0
|
|
if spot == 0:
|
|
L[0:0] = [1]
|
|
break
|
|
L[spot-1] += 1
|
|
spot -= 1
|
|
ans = Decimal((self._sign, L, self._exp))
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
if round and context._rounding_decision == ALWAYS_ROUND:
|
|
ans = ans._fix(context)
|
|
return ans
|
|
|
|
def __mul__(self, other, context=None):
|
|
"""Return self * other.
|
|
|
|
(+-) INF * 0 (or its reverse) raise InvalidOperation.
|
|
"""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
resultsign = self._sign ^ other._sign
|
|
|
|
if self._is_special or other._is_special:
|
|
ans = self._check_nans(other, context)
|
|
if ans:
|
|
return ans
|
|
|
|
if self._isinfinity():
|
|
if not other:
|
|
return context._raise_error(InvalidOperation, '(+-)INF * 0')
|
|
return Infsign[resultsign]
|
|
|
|
if other._isinfinity():
|
|
if not self:
|
|
return context._raise_error(InvalidOperation, '0 * (+-)INF')
|
|
return Infsign[resultsign]
|
|
|
|
resultexp = self._exp + other._exp
|
|
shouldround = context._rounding_decision == ALWAYS_ROUND
|
|
|
|
# Special case for multiplying by zero
|
|
if not self or not other:
|
|
ans = Decimal((resultsign, (0,), resultexp))
|
|
if shouldround:
|
|
#Fixing in case the exponent is out of bounds
|
|
ans = ans._fix(context)
|
|
return ans
|
|
|
|
# Special case for multiplying by power of 10
|
|
if self._int == (1,):
|
|
ans = Decimal((resultsign, other._int, resultexp))
|
|
if shouldround:
|
|
ans = ans._fix(context)
|
|
return ans
|
|
if other._int == (1,):
|
|
ans = Decimal((resultsign, self._int, resultexp))
|
|
if shouldround:
|
|
ans = ans._fix(context)
|
|
return ans
|
|
|
|
op1 = _WorkRep(self)
|
|
op2 = _WorkRep(other)
|
|
|
|
ans = Decimal( (resultsign, map(int, str(op1.int * op2.int)), resultexp))
|
|
if shouldround:
|
|
ans = ans._fix(context)
|
|
|
|
return ans
|
|
__rmul__ = __mul__
|
|
|
|
def __truediv__(self, other, context=None):
|
|
"""Return self / other."""
|
|
return self._divide(other, context=context)
|
|
|
|
def _divide(self, other, divmod = 0, context=None):
|
|
"""Return a / b, to context.prec precision.
|
|
|
|
divmod:
|
|
0 => true division
|
|
1 => (a //b, a%b)
|
|
2 => a //b
|
|
3 => a%b
|
|
|
|
Actually, if divmod is 2 or 3 a tuple is returned, but errors for
|
|
computing the other value are not raised.
|
|
"""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
if divmod in (0, 1):
|
|
return NotImplemented
|
|
return (NotImplemented, NotImplemented)
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
sign = self._sign ^ other._sign
|
|
|
|
if self._is_special or other._is_special:
|
|
ans = self._check_nans(other, context)
|
|
if ans:
|
|
if divmod:
|
|
return (ans, ans)
|
|
return ans
|
|
|
|
if self._isinfinity() and other._isinfinity():
|
|
if divmod:
|
|
return (context._raise_error(InvalidOperation,
|
|
'(+-)INF // (+-)INF'),
|
|
context._raise_error(InvalidOperation,
|
|
'(+-)INF % (+-)INF'))
|
|
return context._raise_error(InvalidOperation, '(+-)INF/(+-)INF')
|
|
|
|
if self._isinfinity():
|
|
if divmod == 1:
|
|
return (Infsign[sign],
|
|
context._raise_error(InvalidOperation, 'INF % x'))
|
|
elif divmod == 2:
|
|
return (Infsign[sign], NaN)
|
|
elif divmod == 3:
|
|
return (Infsign[sign],
|
|
context._raise_error(InvalidOperation, 'INF % x'))
|
|
return Infsign[sign]
|
|
|
|
if other._isinfinity():
|
|
if divmod:
|
|
return (Decimal((sign, (0,), 0)), Decimal(self))
|
|
context._raise_error(Clamped, 'Division by infinity')
|
|
return Decimal((sign, (0,), context.Etiny()))
|
|
|
|
# Special cases for zeroes
|
|
if not self and not other:
|
|
if divmod:
|
|
return context._raise_error(DivisionUndefined, '0 / 0', 1)
|
|
return context._raise_error(DivisionUndefined, '0 / 0')
|
|
|
|
if not self:
|
|
if divmod:
|
|
otherside = Decimal(self)
|
|
otherside._exp = min(self._exp, other._exp)
|
|
return (Decimal((sign, (0,), 0)), otherside)
|
|
exp = self._exp - other._exp
|
|
if exp < context.Etiny():
|
|
exp = context.Etiny()
|
|
context._raise_error(Clamped, '0e-x / y')
|
|
if exp > context.Emax:
|
|
exp = context.Emax
|
|
context._raise_error(Clamped, '0e+x / y')
|
|
return Decimal( (sign, (0,), exp) )
|
|
|
|
if not other:
|
|
if divmod:
|
|
return context._raise_error(DivisionByZero, 'divmod(x,0)',
|
|
sign, 1)
|
|
return context._raise_error(DivisionByZero, 'x / 0', sign)
|
|
|
|
#OK, so neither = 0, INF or NaN
|
|
|
|
shouldround = context._rounding_decision == ALWAYS_ROUND
|
|
|
|
#If we're dividing into ints, and self < other, stop.
|
|
#self.__abs__(0) does not round.
|
|
if divmod and (self.__abs__(0, context) < other.__abs__(0, context)):
|
|
|
|
if divmod == 1 or divmod == 3:
|
|
exp = min(self._exp, other._exp)
|
|
ans2 = self._rescale(exp, context=context, watchexp=0)
|
|
if shouldround:
|
|
ans2 = ans2._fix(context)
|
|
return (Decimal( (sign, (0,), 0) ),
|
|
ans2)
|
|
|
|
elif divmod == 2:
|
|
#Don't round the mod part, if we don't need it.
|
|
return (Decimal( (sign, (0,), 0) ), Decimal(self))
|
|
|
|
op1 = _WorkRep(self)
|
|
op2 = _WorkRep(other)
|
|
op1, op2, adjust = _adjust_coefficients(op1, op2)
|
|
res = _WorkRep( (sign, 0, (op1.exp - op2.exp)) )
|
|
if divmod and res.exp > context.prec + 1:
|
|
return context._raise_error(DivisionImpossible)
|
|
|
|
prec_limit = 10 ** context.prec
|
|
while 1:
|
|
while op2.int <= op1.int:
|
|
res.int += 1
|
|
op1.int -= op2.int
|
|
if res.exp == 0 and divmod:
|
|
if res.int >= prec_limit and shouldround:
|
|
return context._raise_error(DivisionImpossible)
|
|
otherside = Decimal(op1)
|
|
frozen = context._ignore_all_flags()
|
|
|
|
exp = min(self._exp, other._exp)
|
|
otherside = otherside._rescale(exp, context=context, watchexp=0)
|
|
context._regard_flags(*frozen)
|
|
if shouldround:
|
|
otherside = otherside._fix(context)
|
|
return (Decimal(res), otherside)
|
|
|
|
if op1.int == 0 and adjust >= 0 and not divmod:
|
|
break
|
|
if res.int >= prec_limit and shouldround:
|
|
if divmod:
|
|
return context._raise_error(DivisionImpossible)
|
|
shouldround=1
|
|
# Really, the answer is a bit higher, so adding a one to
|
|
# the end will make sure the rounding is right.
|
|
if op1.int != 0:
|
|
res.int *= 10
|
|
res.int += 1
|
|
res.exp -= 1
|
|
|
|
break
|
|
res.int *= 10
|
|
res.exp -= 1
|
|
adjust += 1
|
|
op1.int *= 10
|
|
op1.exp -= 1
|
|
|
|
if res.exp == 0 and divmod and op2.int > op1.int:
|
|
#Solves an error in precision. Same as a previous block.
|
|
|
|
if res.int >= prec_limit and shouldround:
|
|
return context._raise_error(DivisionImpossible)
|
|
otherside = Decimal(op1)
|
|
frozen = context._ignore_all_flags()
|
|
|
|
exp = min(self._exp, other._exp)
|
|
otherside = otherside._rescale(exp, context=context)
|
|
|
|
context._regard_flags(*frozen)
|
|
|
|
return (Decimal(res), otherside)
|
|
|
|
ans = Decimal(res)
|
|
if shouldround:
|
|
ans = ans._fix(context)
|
|
return ans
|
|
|
|
def __rtruediv__(self, other, context=None):
|
|
"""Swaps self/other and returns __truediv__."""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
return other.__truediv__(self, context=context)
|
|
|
|
def __divmod__(self, other, context=None):
|
|
"""
|
|
(self // other, self % other)
|
|
"""
|
|
return self._divide(other, 1, context)
|
|
|
|
def __rdivmod__(self, other, context=None):
|
|
"""Swaps self/other and returns __divmod__."""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
return other.__divmod__(self, context=context)
|
|
|
|
def __mod__(self, other, context=None):
|
|
"""
|
|
self % other
|
|
"""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
|
|
if self._is_special or other._is_special:
|
|
ans = self._check_nans(other, context)
|
|
if ans:
|
|
return ans
|
|
|
|
if self and not other:
|
|
return context._raise_error(InvalidOperation, 'x % 0')
|
|
|
|
return self._divide(other, 3, context)[1]
|
|
|
|
def __rmod__(self, other, context=None):
|
|
"""Swaps self/other and returns __mod__."""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
return other.__mod__(self, context=context)
|
|
|
|
def remainder_near(self, other, context=None):
|
|
"""
|
|
Remainder nearest to 0- abs(remainder-near) <= other/2
|
|
"""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
|
|
if self._is_special or other._is_special:
|
|
ans = self._check_nans(other, context)
|
|
if ans:
|
|
return ans
|
|
if self and not other:
|
|
return context._raise_error(InvalidOperation, 'x % 0')
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
# If DivisionImpossible causes an error, do not leave Rounded/Inexact
|
|
# ignored in the calling function.
|
|
context = context._shallow_copy()
|
|
flags = context._ignore_flags(Rounded, Inexact)
|
|
#keep DivisionImpossible flags
|
|
(side, r) = self.__divmod__(other, context=context)
|
|
|
|
if r._isnan():
|
|
context._regard_flags(*flags)
|
|
return r
|
|
|
|
context = context._shallow_copy()
|
|
rounding = context._set_rounding_decision(NEVER_ROUND)
|
|
|
|
if other._sign:
|
|
comparison = other.__truediv__(Decimal(-2), context=context)
|
|
else:
|
|
comparison = other.__truediv__(Decimal(2), context=context)
|
|
|
|
context._set_rounding_decision(rounding)
|
|
context._regard_flags(*flags)
|
|
|
|
s1, s2 = r._sign, comparison._sign
|
|
r._sign, comparison._sign = 0, 0
|
|
|
|
if r < comparison:
|
|
r._sign, comparison._sign = s1, s2
|
|
#Get flags now
|
|
self.__divmod__(other, context=context)
|
|
return r._fix(context)
|
|
r._sign, comparison._sign = s1, s2
|
|
|
|
rounding = context._set_rounding_decision(NEVER_ROUND)
|
|
|
|
(side, r) = self.__divmod__(other, context=context)
|
|
context._set_rounding_decision(rounding)
|
|
if r._isnan():
|
|
return r
|
|
|
|
decrease = not side._iseven()
|
|
rounding = context._set_rounding_decision(NEVER_ROUND)
|
|
side = side.__abs__(context=context)
|
|
context._set_rounding_decision(rounding)
|
|
|
|
s1, s2 = r._sign, comparison._sign
|
|
r._sign, comparison._sign = 0, 0
|
|
if r > comparison or decrease and r == comparison:
|
|
r._sign, comparison._sign = s1, s2
|
|
context.prec += 1
|
|
if len(side.__add__(Decimal(1), context=context)._int) >= context.prec:
|
|
context.prec -= 1
|
|
return context._raise_error(DivisionImpossible)[1]
|
|
context.prec -= 1
|
|
if self._sign == other._sign:
|
|
r = r.__sub__(other, context=context)
|
|
else:
|
|
r = r.__add__(other, context=context)
|
|
else:
|
|
r._sign, comparison._sign = s1, s2
|
|
|
|
return r._fix(context)
|
|
|
|
def __floordiv__(self, other, context=None):
|
|
"""self // other"""
|
|
return self._divide(other, 2, context)[0]
|
|
|
|
def __rfloordiv__(self, other, context=None):
|
|
"""Swaps self/other and returns __floordiv__."""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
return other.__floordiv__(self, context=context)
|
|
|
|
def __float__(self):
|
|
"""Float representation."""
|
|
return float(str(self))
|
|
|
|
def __int__(self):
|
|
"""Converts self to an int, truncating if necessary."""
|
|
if self._is_special:
|
|
if self._isnan():
|
|
context = getcontext()
|
|
return context._raise_error(InvalidContext)
|
|
elif self._isinfinity():
|
|
raise OverflowError, "Cannot convert infinity to long"
|
|
if self._exp >= 0:
|
|
s = ''.join(map(str, self._int)) + '0'*self._exp
|
|
else:
|
|
s = ''.join(map(str, self._int))[:self._exp]
|
|
if s == '':
|
|
s = '0'
|
|
sign = '-'*self._sign
|
|
return int(sign + s)
|
|
|
|
def __long__(self):
|
|
"""Converts to a long.
|
|
|
|
Equivalent to long(int(self))
|
|
"""
|
|
return long(self.__int__())
|
|
|
|
def _fix(self, context):
|
|
"""Round if it is necessary to keep self within prec precision.
|
|
|
|
Rounds and fixes the exponent. Does not raise on a sNaN.
|
|
|
|
Arguments:
|
|
self - Decimal instance
|
|
context - context used.
|
|
"""
|
|
if self._is_special:
|
|
return self
|
|
if context is None:
|
|
context = getcontext()
|
|
prec = context.prec
|
|
ans = self._fixexponents(context)
|
|
if len(ans._int) > prec:
|
|
ans = ans._round(prec, context=context)
|
|
ans = ans._fixexponents(context)
|
|
return ans
|
|
|
|
def _fixexponents(self, context):
|
|
"""Fix the exponents and return a copy with the exponent in bounds.
|
|
Only call if known to not be a special value.
|
|
"""
|
|
folddown = context._clamp
|
|
Emin = context.Emin
|
|
ans = self
|
|
ans_adjusted = ans.adjusted()
|
|
if ans_adjusted < Emin:
|
|
Etiny = context.Etiny()
|
|
if ans._exp < Etiny:
|
|
if not ans:
|
|
ans = Decimal(self)
|
|
ans._exp = Etiny
|
|
context._raise_error(Clamped)
|
|
return ans
|
|
ans = ans._rescale(Etiny, context=context)
|
|
#It isn't zero, and exp < Emin => subnormal
|
|
context._raise_error(Subnormal)
|
|
if context.flags[Inexact]:
|
|
context._raise_error(Underflow)
|
|
else:
|
|
if ans:
|
|
#Only raise subnormal if non-zero.
|
|
context._raise_error(Subnormal)
|
|
else:
|
|
Etop = context.Etop()
|
|
if folddown and ans._exp > Etop:
|
|
context._raise_error(Clamped)
|
|
ans = ans._rescale(Etop, context=context)
|
|
else:
|
|
Emax = context.Emax
|
|
if ans_adjusted > Emax:
|
|
if not ans:
|
|
ans = Decimal(self)
|
|
ans._exp = Emax
|
|
context._raise_error(Clamped)
|
|
return ans
|
|
context._raise_error(Inexact)
|
|
context._raise_error(Rounded)
|
|
return context._raise_error(Overflow, 'above Emax', ans._sign)
|
|
return ans
|
|
|
|
def _round(self, prec=None, rounding=None, context=None):
|
|
"""Returns a rounded version of self.
|
|
|
|
You can specify the precision or rounding method. Otherwise, the
|
|
context determines it.
|
|
"""
|
|
|
|
if self._is_special:
|
|
ans = self._check_nans(context=context)
|
|
if ans:
|
|
return ans
|
|
|
|
if self._isinfinity():
|
|
return Decimal(self)
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
if rounding is None:
|
|
rounding = context.rounding
|
|
if prec is None:
|
|
prec = context.prec
|
|
|
|
if not self:
|
|
if prec <= 0:
|
|
dig = (0,)
|
|
exp = len(self._int) - prec + self._exp
|
|
else:
|
|
dig = (0,) * prec
|
|
exp = len(self._int) + self._exp - prec
|
|
ans = Decimal((self._sign, dig, exp))
|
|
context._raise_error(Rounded)
|
|
return ans
|
|
|
|
if prec == 0:
|
|
temp = Decimal(self)
|
|
temp._int = (0,)+temp._int
|
|
prec = 1
|
|
elif prec < 0:
|
|
exp = self._exp + len(self._int) - prec - 1
|
|
temp = Decimal( (self._sign, (0, 1), exp))
|
|
prec = 1
|
|
else:
|
|
temp = Decimal(self)
|
|
|
|
numdigits = len(temp._int)
|
|
if prec == numdigits:
|
|
return temp
|
|
|
|
# See if we need to extend precision
|
|
expdiff = prec - numdigits
|
|
if expdiff > 0:
|
|
tmp = list(temp._int)
|
|
tmp.extend([0] * expdiff)
|
|
ans = Decimal( (temp._sign, tmp, temp._exp - expdiff))
|
|
return ans
|
|
|
|
#OK, but maybe all the lost digits are 0.
|
|
lostdigits = self._int[expdiff:]
|
|
if lostdigits == (0,) * len(lostdigits):
|
|
ans = Decimal( (temp._sign, temp._int[:prec], temp._exp - expdiff))
|
|
#Rounded, but not Inexact
|
|
context._raise_error(Rounded)
|
|
return ans
|
|
|
|
# Okay, let's round and lose data
|
|
|
|
this_function = getattr(temp, self._pick_rounding_function[rounding])
|
|
#Now we've got the rounding function
|
|
|
|
if prec != context.prec:
|
|
context = context._shallow_copy()
|
|
context.prec = prec
|
|
ans = this_function(prec, expdiff, context)
|
|
context._raise_error(Rounded)
|
|
context._raise_error(Inexact, 'Changed in rounding')
|
|
|
|
return ans
|
|
|
|
_pick_rounding_function = {}
|
|
|
|
def _round_down(self, prec, expdiff, context):
|
|
"""Also known as round-towards-0, truncate."""
|
|
return Decimal( (self._sign, self._int[:prec], self._exp - expdiff) )
|
|
|
|
def _round_half_up(self, prec, expdiff, context, tmp = None):
|
|
"""Rounds 5 up (away from 0)"""
|
|
|
|
if tmp is None:
|
|
tmp = Decimal( (self._sign,self._int[:prec], self._exp - expdiff))
|
|
if self._int[prec] >= 5:
|
|
tmp = tmp._increment(round=0, context=context)
|
|
if len(tmp._int) > prec:
|
|
return Decimal( (tmp._sign, tmp._int[:-1], tmp._exp + 1))
|
|
return tmp
|
|
|
|
def _round_half_even(self, prec, expdiff, context):
|
|
"""Round 5 to even, rest to nearest."""
|
|
|
|
tmp = Decimal( (self._sign, self._int[:prec], self._exp - expdiff))
|
|
half = (self._int[prec] == 5)
|
|
if half:
|
|
for digit in self._int[prec+1:]:
|
|
if digit != 0:
|
|
half = 0
|
|
break
|
|
if half:
|
|
if self._int[prec-1] & 1 == 0:
|
|
return tmp
|
|
return self._round_half_up(prec, expdiff, context, tmp)
|
|
|
|
def _round_half_down(self, prec, expdiff, context):
|
|
"""Round 5 down"""
|
|
|
|
tmp = Decimal( (self._sign, self._int[:prec], self._exp - expdiff))
|
|
half = (self._int[prec] == 5)
|
|
if half:
|
|
for digit in self._int[prec+1:]:
|
|
if digit != 0:
|
|
half = 0
|
|
break
|
|
if half:
|
|
return tmp
|
|
return self._round_half_up(prec, expdiff, context, tmp)
|
|
|
|
def _round_up(self, prec, expdiff, context):
|
|
"""Rounds away from 0."""
|
|
tmp = Decimal( (self._sign, self._int[:prec], self._exp - expdiff) )
|
|
for digit in self._int[prec:]:
|
|
if digit != 0:
|
|
tmp = tmp._increment(round=1, context=context)
|
|
if len(tmp._int) > prec:
|
|
return Decimal( (tmp._sign, tmp._int[:-1], tmp._exp + 1))
|
|
else:
|
|
return tmp
|
|
return tmp
|
|
|
|
def _round_ceiling(self, prec, expdiff, context):
|
|
"""Rounds up (not away from 0 if negative.)"""
|
|
if self._sign:
|
|
return self._round_down(prec, expdiff, context)
|
|
else:
|
|
return self._round_up(prec, expdiff, context)
|
|
|
|
def _round_floor(self, prec, expdiff, context):
|
|
"""Rounds down (not towards 0 if negative)"""
|
|
if not self._sign:
|
|
return self._round_down(prec, expdiff, context)
|
|
else:
|
|
return self._round_up(prec, expdiff, context)
|
|
|
|
def __pow__(self, n, modulo = None, context=None):
|
|
"""Return self ** n (mod modulo)
|
|
|
|
If modulo is None (default), don't take it mod modulo.
|
|
"""
|
|
n = _convert_other(n)
|
|
if n is NotImplemented:
|
|
return n
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
if self._is_special or n._is_special or n.adjusted() > 8:
|
|
#Because the spot << doesn't work with really big exponents
|
|
if n._isinfinity() or n.adjusted() > 8:
|
|
return context._raise_error(InvalidOperation, 'x ** INF')
|
|
|
|
ans = self._check_nans(n, context)
|
|
if ans:
|
|
return ans
|
|
|
|
if not n._isinteger():
|
|
return context._raise_error(InvalidOperation, 'x ** (non-integer)')
|
|
|
|
if not self and not n:
|
|
return context._raise_error(InvalidOperation, '0 ** 0')
|
|
|
|
if not n:
|
|
return Decimal(1)
|
|
|
|
if self == Decimal(1):
|
|
return Decimal(1)
|
|
|
|
sign = self._sign and not n._iseven()
|
|
n = int(n)
|
|
|
|
if self._isinfinity():
|
|
if modulo:
|
|
return context._raise_error(InvalidOperation, 'INF % x')
|
|
if n > 0:
|
|
return Infsign[sign]
|
|
return Decimal( (sign, (0,), 0) )
|
|
|
|
#with ludicrously large exponent, just raise an overflow and return inf.
|
|
if not modulo and n > 0 and (self._exp + len(self._int) - 1) * n > context.Emax \
|
|
and self:
|
|
|
|
tmp = Decimal('inf')
|
|
tmp._sign = sign
|
|
context._raise_error(Rounded)
|
|
context._raise_error(Inexact)
|
|
context._raise_error(Overflow, 'Big power', sign)
|
|
return tmp
|
|
|
|
elength = len(str(abs(n)))
|
|
firstprec = context.prec
|
|
|
|
if not modulo and firstprec + elength + 1 > DefaultContext.Emax:
|
|
return context._raise_error(Overflow, 'Too much precision.', sign)
|
|
|
|
mul = Decimal(self)
|
|
val = Decimal(1)
|
|
context = context._shallow_copy()
|
|
context.prec = firstprec + elength + 1
|
|
if n < 0:
|
|
#n is a long now, not Decimal instance
|
|
n = -n
|
|
mul = Decimal(1).__truediv__(mul, context=context)
|
|
|
|
spot = 1
|
|
while spot <= n:
|
|
spot <<= 1
|
|
|
|
spot >>= 1
|
|
#Spot is the highest power of 2 less than n
|
|
while spot:
|
|
val = val.__mul__(val, context=context)
|
|
if val._isinfinity():
|
|
val = Infsign[sign]
|
|
break
|
|
if spot & n:
|
|
val = val.__mul__(mul, context=context)
|
|
if modulo is not None:
|
|
val = val.__mod__(modulo, context=context)
|
|
spot >>= 1
|
|
context.prec = firstprec
|
|
|
|
if context._rounding_decision == ALWAYS_ROUND:
|
|
return val._fix(context)
|
|
return val
|
|
|
|
def __rpow__(self, other, context=None):
|
|
"""Swaps self/other and returns __pow__."""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
return other.__pow__(self, context=context)
|
|
|
|
def normalize(self, context=None):
|
|
"""Normalize- strip trailing 0s, change anything equal to 0 to 0e0"""
|
|
|
|
if self._is_special:
|
|
ans = self._check_nans(context=context)
|
|
if ans:
|
|
return ans
|
|
|
|
dup = self._fix(context)
|
|
if dup._isinfinity():
|
|
return dup
|
|
|
|
if not dup:
|
|
return Decimal( (dup._sign, (0,), 0) )
|
|
end = len(dup._int)
|
|
exp = dup._exp
|
|
while dup._int[end-1] == 0:
|
|
exp += 1
|
|
end -= 1
|
|
return Decimal( (dup._sign, dup._int[:end], exp) )
|
|
|
|
|
|
def quantize(self, exp, rounding=None, context=None, watchexp=1):
|
|
"""Quantize self so its exponent is the same as that of exp.
|
|
|
|
Similar to self._rescale(exp._exp) but with error checking.
|
|
"""
|
|
if self._is_special or exp._is_special:
|
|
ans = self._check_nans(exp, context)
|
|
if ans:
|
|
return ans
|
|
|
|
if exp._isinfinity() or self._isinfinity():
|
|
if exp._isinfinity() and self._isinfinity():
|
|
return self #if both are inf, it is OK
|
|
if context is None:
|
|
context = getcontext()
|
|
return context._raise_error(InvalidOperation,
|
|
'quantize with one INF')
|
|
return self._rescale(exp._exp, rounding, context, watchexp)
|
|
|
|
def same_quantum(self, other):
|
|
"""Test whether self and other have the same exponent.
|
|
|
|
same as self._exp == other._exp, except NaN == sNaN
|
|
"""
|
|
if self._is_special or other._is_special:
|
|
if self._isnan() or other._isnan():
|
|
return self._isnan() and other._isnan() and True
|
|
if self._isinfinity() or other._isinfinity():
|
|
return self._isinfinity() and other._isinfinity() and True
|
|
return self._exp == other._exp
|
|
|
|
def _rescale(self, exp, rounding=None, context=None, watchexp=1):
|
|
"""Rescales so that the exponent is exp.
|
|
|
|
exp = exp to scale to (an integer)
|
|
rounding = rounding version
|
|
watchexp: if set (default) an error is returned if exp is greater
|
|
than Emax or less than Etiny.
|
|
"""
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
if self._is_special:
|
|
if self._isinfinity():
|
|
return context._raise_error(InvalidOperation, 'rescale with an INF')
|
|
|
|
ans = self._check_nans(context=context)
|
|
if ans:
|
|
return ans
|
|
|
|
if watchexp and (context.Emax < exp or context.Etiny() > exp):
|
|
return context._raise_error(InvalidOperation, 'rescale(a, INF)')
|
|
|
|
if not self:
|
|
ans = Decimal(self)
|
|
ans._int = (0,)
|
|
ans._exp = exp
|
|
return ans
|
|
|
|
diff = self._exp - exp
|
|
digits = len(self._int) + diff
|
|
|
|
if watchexp and digits > context.prec:
|
|
return context._raise_error(InvalidOperation, 'Rescale > prec')
|
|
|
|
tmp = Decimal(self)
|
|
tmp._int = (0,) + tmp._int
|
|
digits += 1
|
|
|
|
if digits < 0:
|
|
tmp._exp = -digits + tmp._exp
|
|
tmp._int = (0,1)
|
|
digits = 1
|
|
tmp = tmp._round(digits, rounding, context=context)
|
|
|
|
if tmp._int[0] == 0 and len(tmp._int) > 1:
|
|
tmp._int = tmp._int[1:]
|
|
tmp._exp = exp
|
|
|
|
tmp_adjusted = tmp.adjusted()
|
|
if tmp and tmp_adjusted < context.Emin:
|
|
context._raise_error(Subnormal)
|
|
elif tmp and tmp_adjusted > context.Emax:
|
|
return context._raise_error(InvalidOperation, 'rescale(a, INF)')
|
|
return tmp
|
|
|
|
def to_integral(self, rounding=None, context=None):
|
|
"""Rounds to the nearest integer, without raising inexact, rounded."""
|
|
if self._is_special:
|
|
ans = self._check_nans(context=context)
|
|
if ans:
|
|
return ans
|
|
return self
|
|
if self._exp >= 0:
|
|
return self
|
|
if context is None:
|
|
context = getcontext()
|
|
flags = context._ignore_flags(Rounded, Inexact)
|
|
ans = self._rescale(0, rounding, context=context)
|
|
context._regard_flags(flags)
|
|
return ans
|
|
|
|
def sqrt(self, context=None):
|
|
"""Return the square root of self.
|
|
|
|
Uses a converging algorithm (Xn+1 = 0.5*(Xn + self / Xn))
|
|
Should quadratically approach the right answer.
|
|
"""
|
|
if self._is_special:
|
|
ans = self._check_nans(context=context)
|
|
if ans:
|
|
return ans
|
|
|
|
if self._isinfinity() and self._sign == 0:
|
|
return Decimal(self)
|
|
|
|
if not self:
|
|
#exponent = self._exp / 2, using round_down.
|
|
#if self._exp < 0:
|
|
# exp = (self._exp+1) // 2
|
|
#else:
|
|
exp = (self._exp) // 2
|
|
if self._sign == 1:
|
|
#sqrt(-0) = -0
|
|
return Decimal( (1, (0,), exp))
|
|
else:
|
|
return Decimal( (0, (0,), exp))
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
|
|
if self._sign == 1:
|
|
return context._raise_error(InvalidOperation, 'sqrt(-x), x > 0')
|
|
|
|
tmp = Decimal(self)
|
|
|
|
expadd = tmp._exp // 2
|
|
if tmp._exp & 1:
|
|
tmp._int += (0,)
|
|
tmp._exp = 0
|
|
else:
|
|
tmp._exp = 0
|
|
|
|
context = context._shallow_copy()
|
|
flags = context._ignore_all_flags()
|
|
firstprec = context.prec
|
|
context.prec = 3
|
|
if tmp.adjusted() & 1 == 0:
|
|
ans = Decimal( (0, (8,1,9), tmp.adjusted() - 2) )
|
|
ans = ans.__add__(tmp.__mul__(Decimal((0, (2,5,9), -2)),
|
|
context=context), context=context)
|
|
ans._exp -= 1 + tmp.adjusted() // 2
|
|
else:
|
|
ans = Decimal( (0, (2,5,9), tmp._exp + len(tmp._int)- 3) )
|
|
ans = ans.__add__(tmp.__mul__(Decimal((0, (8,1,9), -3)),
|
|
context=context), context=context)
|
|
ans._exp -= 1 + tmp.adjusted() // 2
|
|
|
|
#ans is now a linear approximation.
|
|
|
|
Emax, Emin = context.Emax, context.Emin
|
|
context.Emax, context.Emin = DefaultContext.Emax, DefaultContext.Emin
|
|
|
|
half = Decimal('0.5')
|
|
|
|
maxp = firstprec + 2
|
|
rounding = context._set_rounding(ROUND_HALF_EVEN)
|
|
while 1:
|
|
context.prec = min(2*context.prec - 2, maxp)
|
|
ans = half.__mul__(ans.__add__(tmp.__truediv__(ans, context=context),
|
|
context=context), context=context)
|
|
if context.prec == maxp:
|
|
break
|
|
|
|
#round to the answer's precision-- the only error can be 1 ulp.
|
|
context.prec = firstprec
|
|
prevexp = ans.adjusted()
|
|
ans = ans._round(context=context)
|
|
|
|
#Now, check if the other last digits are better.
|
|
context.prec = firstprec + 1
|
|
# In case we rounded up another digit and we should actually go lower.
|
|
if prevexp != ans.adjusted():
|
|
ans._int += (0,)
|
|
ans._exp -= 1
|
|
|
|
|
|
lower = ans.__sub__(Decimal((0, (5,), ans._exp-1)), context=context)
|
|
context._set_rounding(ROUND_UP)
|
|
if lower.__mul__(lower, context=context) > (tmp):
|
|
ans = ans.__sub__(Decimal((0, (1,), ans._exp)), context=context)
|
|
|
|
else:
|
|
upper = ans.__add__(Decimal((0, (5,), ans._exp-1)),context=context)
|
|
context._set_rounding(ROUND_DOWN)
|
|
if upper.__mul__(upper, context=context) < tmp:
|
|
ans = ans.__add__(Decimal((0, (1,), ans._exp)),context=context)
|
|
|
|
ans._exp += expadd
|
|
|
|
context.prec = firstprec
|
|
context.rounding = rounding
|
|
ans = ans._fix(context)
|
|
|
|
rounding = context._set_rounding_decision(NEVER_ROUND)
|
|
if not ans.__mul__(ans, context=context) == self:
|
|
# Only rounded/inexact if here.
|
|
context._regard_flags(flags)
|
|
context._raise_error(Rounded)
|
|
context._raise_error(Inexact)
|
|
else:
|
|
#Exact answer, so let's set the exponent right.
|
|
#if self._exp < 0:
|
|
# exp = (self._exp +1)// 2
|
|
#else:
|
|
exp = self._exp // 2
|
|
context.prec += ans._exp - exp
|
|
ans = ans._rescale(exp, context=context)
|
|
context.prec = firstprec
|
|
context._regard_flags(flags)
|
|
context.Emax, context.Emin = Emax, Emin
|
|
|
|
return ans._fix(context)
|
|
|
|
def max(self, other, context=None):
|
|
"""Returns the larger value.
|
|
|
|
like max(self, other) except if one is not a number, returns
|
|
NaN (and signals if one is sNaN). Also rounds.
|
|
"""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
|
|
if self._is_special or other._is_special:
|
|
# if one operand is a quiet NaN and the other is number, then the
|
|
# number is always returned
|
|
sn = self._isnan()
|
|
on = other._isnan()
|
|
if sn or on:
|
|
if on == 1 and sn != 2:
|
|
return self
|
|
if sn == 1 and on != 2:
|
|
return other
|
|
return self._check_nans(other, context)
|
|
|
|
ans = self
|
|
c = self.__cmp__(other)
|
|
if c == 0:
|
|
# if both operands are finite and equal in numerical value
|
|
# then an ordering is applied:
|
|
#
|
|
# if the signs differ then max returns the operand with the
|
|
# positive sign and min returns the operand with the negative sign
|
|
#
|
|
# if the signs are the same then the exponent is used to select
|
|
# the result.
|
|
if self._sign != other._sign:
|
|
if self._sign:
|
|
ans = other
|
|
elif self._exp < other._exp and not self._sign:
|
|
ans = other
|
|
elif self._exp > other._exp and self._sign:
|
|
ans = other
|
|
elif c == -1:
|
|
ans = other
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
if context._rounding_decision == ALWAYS_ROUND:
|
|
return ans._fix(context)
|
|
return ans
|
|
|
|
def min(self, other, context=None):
|
|
"""Returns the smaller value.
|
|
|
|
like min(self, other) except if one is not a number, returns
|
|
NaN (and signals if one is sNaN). Also rounds.
|
|
"""
|
|
other = _convert_other(other)
|
|
if other is NotImplemented:
|
|
return other
|
|
|
|
if self._is_special or other._is_special:
|
|
# if one operand is a quiet NaN and the other is number, then the
|
|
# number is always returned
|
|
sn = self._isnan()
|
|
on = other._isnan()
|
|
if sn or on:
|
|
if on == 1 and sn != 2:
|
|
return self
|
|
if sn == 1 and on != 2:
|
|
return other
|
|
return self._check_nans(other, context)
|
|
|
|
ans = self
|
|
c = self.__cmp__(other)
|
|
if c == 0:
|
|
# if both operands are finite and equal in numerical value
|
|
# then an ordering is applied:
|
|
#
|
|
# if the signs differ then max returns the operand with the
|
|
# positive sign and min returns the operand with the negative sign
|
|
#
|
|
# if the signs are the same then the exponent is used to select
|
|
# the result.
|
|
if self._sign != other._sign:
|
|
if other._sign:
|
|
ans = other
|
|
elif self._exp > other._exp and not self._sign:
|
|
ans = other
|
|
elif self._exp < other._exp and self._sign:
|
|
ans = other
|
|
elif c == 1:
|
|
ans = other
|
|
|
|
if context is None:
|
|
context = getcontext()
|
|
if context._rounding_decision == ALWAYS_ROUND:
|
|
return ans._fix(context)
|
|
return ans
|
|
|
|
def _isinteger(self):
|
|
"""Returns whether self is an integer"""
|
|
if self._exp >= 0:
|
|
return True
|
|
rest = self._int[self._exp:]
|
|
return rest == (0,)*len(rest)
|
|
|
|
def _iseven(self):
|
|
"""Returns 1 if self is even. Assumes self is an integer."""
|
|
if self._exp > 0:
|
|
return 1
|
|
return self._int[-1+self._exp] & 1 == 0
|
|
|
|
def adjusted(self):
|
|
"""Return the adjusted exponent of self"""
|
|
try:
|
|
return self._exp + len(self._int) - 1
|
|
#If NaN or Infinity, self._exp is string
|
|
except TypeError:
|
|
return 0
|
|
|
|
# support for pickling, copy, and deepcopy
|
|
def __reduce__(self):
|
|
return (self.__class__, (str(self),))
|
|
|
|
def __copy__(self):
|
|
if type(self) == Decimal:
|
|
return self # I'm immutable; therefore I am my own clone
|
|
return self.__class__(str(self))
|
|
|
|
def __deepcopy__(self, memo):
|
|
if type(self) == Decimal:
|
|
return self # My components are also immutable
|
|
return self.__class__(str(self))
|
|
|
|
##### Context class ###########################################
|
|
|
|
|
|
# get rounding method function:
|
|
rounding_functions = [name for name in Decimal.__dict__.keys() if name.startswith('_round_')]
|
|
for name in rounding_functions:
|
|
#name is like _round_half_even, goes to the global ROUND_HALF_EVEN value.
|
|
globalname = name[1:].upper()
|
|
val = globals()[globalname]
|
|
Decimal._pick_rounding_function[val] = name
|
|
|
|
del name, val, globalname, rounding_functions
|
|
|
|
class _ContextManager(object):
|
|
"""Context manager class to support localcontext().
|
|
|
|
Sets a copy of the supplied context in __enter__() and restores
|
|
the previous decimal context in __exit__()
|
|
"""
|
|
def __init__(self, new_context):
|
|
self.new_context = new_context.copy()
|
|
def __enter__(self):
|
|
self.saved_context = getcontext()
|
|
setcontext(self.new_context)
|
|
return self.new_context
|
|
def __exit__(self, t, v, tb):
|
|
setcontext(self.saved_context)
|
|
|
|
class Context(object):
|
|
"""Contains the context for a Decimal instance.
|
|
|
|
Contains:
|
|
prec - precision (for use in rounding, division, square roots..)
|
|
rounding - rounding type. (how you round)
|
|
_rounding_decision - ALWAYS_ROUND, NEVER_ROUND -- do you round?
|
|
traps - If traps[exception] = 1, then the exception is
|
|
raised when it is caused. Otherwise, a value is
|
|
substituted in.
|
|
flags - When an exception is caused, flags[exception] is incremented.
|
|
(Whether or not the trap_enabler is set)
|
|
Should be reset by user of Decimal instance.
|
|
Emin - Minimum exponent
|
|
Emax - Maximum exponent
|
|
capitals - If 1, 1*10^1 is printed as 1E+1.
|
|
If 0, printed as 1e1
|
|
_clamp - If 1, change exponents if too high (Default 0)
|
|
"""
|
|
|
|
def __init__(self, prec=None, rounding=None,
|
|
traps=None, flags=None,
|
|
_rounding_decision=None,
|
|
Emin=None, Emax=None,
|
|
capitals=None, _clamp=0,
|
|
_ignored_flags=None):
|
|
if flags is None:
|
|
flags = []
|
|
if _ignored_flags is None:
|
|
_ignored_flags = []
|
|
if not isinstance(flags, dict):
|
|
flags = dict([(s,s in flags) for s in _signals])
|
|
del s
|
|
if traps is not None and not isinstance(traps, dict):
|
|
traps = dict([(s,s in traps) for s in _signals])
|
|
del s
|
|
for name, val in locals().items():
|
|
if val is None:
|
|
setattr(self, name, _copy.copy(getattr(DefaultContext, name)))
|
|
else:
|
|
setattr(self, name, val)
|
|
del self.self
|
|
|
|
def __repr__(self):
|
|
"""Show the current context."""
|
|
s = []
|
|
s.append('Context(prec=%(prec)d, rounding=%(rounding)s, Emin=%(Emin)d, Emax=%(Emax)d, capitals=%(capitals)d' % vars(self))
|
|
s.append('flags=[' + ', '.join([f.__name__ for f, v in self.flags.items() if v]) + ']')
|
|
s.append('traps=[' + ', '.join([t.__name__ for t, v in self.traps.items() if v]) + ']')
|
|
return ', '.join(s) + ')'
|
|
|
|
def clear_flags(self):
|
|
"""Reset all flags to zero"""
|
|
for flag in self.flags:
|
|
self.flags[flag] = 0
|
|
|
|
def _shallow_copy(self):
|
|
"""Returns a shallow copy from self."""
|
|
nc = Context(self.prec, self.rounding, self.traps, self.flags,
|
|
self._rounding_decision, self.Emin, self.Emax,
|
|
self.capitals, self._clamp, self._ignored_flags)
|
|
return nc
|
|
|
|
def copy(self):
|
|
"""Returns a deep copy from self."""
|
|
nc = Context(self.prec, self.rounding, self.traps.copy(), self.flags.copy(),
|
|
self._rounding_decision, self.Emin, self.Emax,
|
|
self.capitals, self._clamp, self._ignored_flags)
|
|
return nc
|
|
__copy__ = copy
|
|
|
|
def _raise_error(self, condition, explanation = None, *args):
|
|
"""Handles an error
|
|
|
|
If the flag is in _ignored_flags, returns the default response.
|
|
Otherwise, it increments the flag, then, if the corresponding
|
|
trap_enabler is set, it reaises the exception. Otherwise, it returns
|
|
the default value after incrementing the flag.
|
|
"""
|
|
error = _condition_map.get(condition, condition)
|
|
if error in self._ignored_flags:
|
|
#Don't touch the flag
|
|
return error().handle(self, *args)
|
|
|
|
self.flags[error] += 1
|
|
if not self.traps[error]:
|
|
#The errors define how to handle themselves.
|
|
return condition().handle(self, *args)
|
|
|
|
# Errors should only be risked on copies of the context
|
|
#self._ignored_flags = []
|
|
raise error, explanation
|
|
|
|
def _ignore_all_flags(self):
|
|
"""Ignore all flags, if they are raised"""
|
|
return self._ignore_flags(*_signals)
|
|
|
|
def _ignore_flags(self, *flags):
|
|
"""Ignore the flags, if they are raised"""
|
|
# Do not mutate-- This way, copies of a context leave the original
|
|
# alone.
|
|
self._ignored_flags = (self._ignored_flags + list(flags))
|
|
return list(flags)
|
|
|
|
def _regard_flags(self, *flags):
|
|
"""Stop ignoring the flags, if they are raised"""
|
|
if flags and isinstance(flags[0], (tuple,list)):
|
|
flags = flags[0]
|
|
for flag in flags:
|
|
self._ignored_flags.remove(flag)
|
|
|
|
def __hash__(self):
|
|
"""A Context cannot be hashed."""
|
|
# We inherit object.__hash__, so we must deny this explicitly
|
|
raise TypeError, "Cannot hash a Context."
|
|
|
|
def Etiny(self):
|
|
"""Returns Etiny (= Emin - prec + 1)"""
|
|
return int(self.Emin - self.prec + 1)
|
|
|
|
def Etop(self):
|
|
"""Returns maximum exponent (= Emax - prec + 1)"""
|
|
return int(self.Emax - self.prec + 1)
|
|
|
|
def _set_rounding_decision(self, type):
|
|
"""Sets the rounding decision.
|
|
|
|
Sets the rounding decision, and returns the current (previous)
|
|
rounding decision. Often used like:
|
|
|
|
context = context._shallow_copy()
|
|
# That so you don't change the calling context
|
|
# if an error occurs in the middle (say DivisionImpossible is raised).
|
|
|
|
rounding = context._set_rounding_decision(NEVER_ROUND)
|
|
instance = instance / Decimal(2)
|
|
context._set_rounding_decision(rounding)
|
|
|
|
This will make it not round for that operation.
|
|
"""
|
|
|
|
rounding = self._rounding_decision
|
|
self._rounding_decision = type
|
|
return rounding
|
|
|
|
def _set_rounding(self, type):
|
|
"""Sets the rounding type.
|
|
|
|
Sets the rounding type, and returns the current (previous)
|
|
rounding type. Often used like:
|
|
|
|
context = context.copy()
|
|
# so you don't change the calling context
|
|
# if an error occurs in the middle.
|
|
rounding = context._set_rounding(ROUND_UP)
|
|
val = self.__sub__(other, context=context)
|
|
context._set_rounding(rounding)
|
|
|
|
This will make it round up for that operation.
|
|
"""
|
|
rounding = self.rounding
|
|
self.rounding= type
|
|
return rounding
|
|
|
|
def create_decimal(self, num='0'):
|
|
"""Creates a new Decimal instance but using self as context."""
|
|
d = Decimal(num, context=self)
|
|
return d._fix(self)
|
|
|
|
#Methods
|
|
def abs(self, a):
|
|
"""Returns the absolute value of the operand.
|
|
|
|
If the operand is negative, the result is the same as using the minus
|
|
operation on the operand. Otherwise, the result is the same as using
|
|
the plus operation on the operand.
|
|
|
|
>>> ExtendedContext.abs(Decimal('2.1'))
|
|
Decimal("2.1")
|
|
>>> ExtendedContext.abs(Decimal('-100'))
|
|
Decimal("100")
|
|
>>> ExtendedContext.abs(Decimal('101.5'))
|
|
Decimal("101.5")
|
|
>>> ExtendedContext.abs(Decimal('-101.5'))
|
|
Decimal("101.5")
|
|
"""
|
|
return a.__abs__(context=self)
|
|
|
|
def add(self, a, b):
|
|
"""Return the sum of the two operands.
|
|
|
|
>>> ExtendedContext.add(Decimal('12'), Decimal('7.00'))
|
|
Decimal("19.00")
|
|
>>> ExtendedContext.add(Decimal('1E+2'), Decimal('1.01E+4'))
|
|
Decimal("1.02E+4")
|
|
"""
|
|
return a.__add__(b, context=self)
|
|
|
|
def _apply(self, a):
|
|
return str(a._fix(self))
|
|
|
|
def compare(self, a, b):
|
|
"""Compares values numerically.
|
|
|
|
If the signs of the operands differ, a value representing each operand
|
|
('-1' if the operand is less than zero, '0' if the operand is zero or
|
|
negative zero, or '1' if the operand is greater than zero) is used in
|
|
place of that operand for the comparison instead of the actual
|
|
operand.
|
|
|
|
The comparison is then effected by subtracting the second operand from
|
|
the first and then returning a value according to the result of the
|
|
subtraction: '-1' if the result is less than zero, '0' if the result is
|
|
zero or negative zero, or '1' if the result is greater than zero.
|
|
|
|
>>> ExtendedContext.compare(Decimal('2.1'), Decimal('3'))
|
|
Decimal("-1")
|
|
>>> ExtendedContext.compare(Decimal('2.1'), Decimal('2.1'))
|
|
Decimal("0")
|
|
>>> ExtendedContext.compare(Decimal('2.1'), Decimal('2.10'))
|
|
Decimal("0")
|
|
>>> ExtendedContext.compare(Decimal('3'), Decimal('2.1'))
|
|
Decimal("1")
|
|
>>> ExtendedContext.compare(Decimal('2.1'), Decimal('-3'))
|
|
Decimal("1")
|
|
>>> ExtendedContext.compare(Decimal('-3'), Decimal('2.1'))
|
|
Decimal("-1")
|
|
"""
|
|
return a.compare(b, context=self)
|
|
|
|
def divide(self, a, b):
|
|
"""Decimal division in a specified context.
|
|
|
|
>>> ExtendedContext.divide(Decimal('1'), Decimal('3'))
|
|
Decimal("0.333333333")
|
|
>>> ExtendedContext.divide(Decimal('2'), Decimal('3'))
|
|
Decimal("0.666666667")
|
|
>>> ExtendedContext.divide(Decimal('5'), Decimal('2'))
|
|
Decimal("2.5")
|
|
>>> ExtendedContext.divide(Decimal('1'), Decimal('10'))
|
|
Decimal("0.1")
|
|
>>> ExtendedContext.divide(Decimal('12'), Decimal('12'))
|
|
Decimal("1")
|
|
>>> ExtendedContext.divide(Decimal('8.00'), Decimal('2'))
|
|
Decimal("4.00")
|
|
>>> ExtendedContext.divide(Decimal('2.400'), Decimal('2.0'))
|
|
Decimal("1.20")
|
|
>>> ExtendedContext.divide(Decimal('1000'), Decimal('100'))
|
|
Decimal("10")
|
|
>>> ExtendedContext.divide(Decimal('1000'), Decimal('1'))
|
|
Decimal("1000")
|
|
>>> ExtendedContext.divide(Decimal('2.40E+6'), Decimal('2'))
|
|
Decimal("1.20E+6")
|
|
"""
|
|
return a.__truediv__(b, context=self)
|
|
|
|
def divide_int(self, a, b):
|
|
"""Divides two numbers and returns the integer part of the result.
|
|
|
|
>>> ExtendedContext.divide_int(Decimal('2'), Decimal('3'))
|
|
Decimal("0")
|
|
>>> ExtendedContext.divide_int(Decimal('10'), Decimal('3'))
|
|
Decimal("3")
|
|
>>> ExtendedContext.divide_int(Decimal('1'), Decimal('0.3'))
|
|
Decimal("3")
|
|
"""
|
|
return a.__floordiv__(b, context=self)
|
|
|
|
def divmod(self, a, b):
|
|
return a.__divmod__(b, context=self)
|
|
|
|
def max(self, a,b):
|
|
"""max compares two values numerically and returns the maximum.
|
|
|
|
If either operand is a NaN then the general rules apply.
|
|
Otherwise, the operands are compared as as though by the compare
|
|
operation. If they are numerically equal then the left-hand operand
|
|
is chosen as the result. Otherwise the maximum (closer to positive
|
|
infinity) of the two operands is chosen as the result.
|
|
|
|
>>> ExtendedContext.max(Decimal('3'), Decimal('2'))
|
|
Decimal("3")
|
|
>>> ExtendedContext.max(Decimal('-10'), Decimal('3'))
|
|
Decimal("3")
|
|
>>> ExtendedContext.max(Decimal('1.0'), Decimal('1'))
|
|
Decimal("1")
|
|
>>> ExtendedContext.max(Decimal('7'), Decimal('NaN'))
|
|
Decimal("7")
|
|
"""
|
|
return a.max(b, context=self)
|
|
|
|
def min(self, a,b):
|
|
"""min compares two values numerically and returns the minimum.
|
|
|
|
If either operand is a NaN then the general rules apply.
|
|
Otherwise, the operands are compared as as though by the compare
|
|
operation. If they are numerically equal then the left-hand operand
|
|
is chosen as the result. Otherwise the minimum (closer to negative
|
|
infinity) of the two operands is chosen as the result.
|
|
|
|
>>> ExtendedContext.min(Decimal('3'), Decimal('2'))
|
|
Decimal("2")
|
|
>>> ExtendedContext.min(Decimal('-10'), Decimal('3'))
|
|
Decimal("-10")
|
|
>>> ExtendedContext.min(Decimal('1.0'), Decimal('1'))
|
|
Decimal("1.0")
|
|
>>> ExtendedContext.min(Decimal('7'), Decimal('NaN'))
|
|
Decimal("7")
|
|
"""
|
|
return a.min(b, context=self)
|
|
|
|
def minus(self, a):
|
|
"""Minus corresponds to unary prefix minus in Python.
|
|
|
|
The operation is evaluated using the same rules as subtract; the
|
|
operation minus(a) is calculated as subtract('0', a) where the '0'
|
|
has the same exponent as the operand.
|
|
|
|
>>> ExtendedContext.minus(Decimal('1.3'))
|
|
Decimal("-1.3")
|
|
>>> ExtendedContext.minus(Decimal('-1.3'))
|
|
Decimal("1.3")
|
|
"""
|
|
return a.__neg__(context=self)
|
|
|
|
def multiply(self, a, b):
|
|
"""multiply multiplies two operands.
|
|
|
|
If either operand is a special value then the general rules apply.
|
|
Otherwise, the operands are multiplied together ('long multiplication'),
|
|
resulting in a number which may be as long as the sum of the lengths
|
|
of the two operands.
|
|
|
|
>>> ExtendedContext.multiply(Decimal('1.20'), Decimal('3'))
|
|
Decimal("3.60")
|
|
>>> ExtendedContext.multiply(Decimal('7'), Decimal('3'))
|
|
Decimal("21")
|
|
>>> ExtendedContext.multiply(Decimal('0.9'), Decimal('0.8'))
|
|
Decimal("0.72")
|
|
>>> ExtendedContext.multiply(Decimal('0.9'), Decimal('-0'))
|
|
Decimal("-0.0")
|
|
>>> ExtendedContext.multiply(Decimal('654321'), Decimal('654321'))
|
|
Decimal("4.28135971E+11")
|
|
"""
|
|
return a.__mul__(b, context=self)
|
|
|
|
def normalize(self, a):
|
|
"""normalize reduces an operand to its simplest form.
|
|
|
|
Essentially a plus operation with all trailing zeros removed from the
|
|
result.
|
|
|
|
>>> ExtendedContext.normalize(Decimal('2.1'))
|
|
Decimal("2.1")
|
|
>>> ExtendedContext.normalize(Decimal('-2.0'))
|
|
Decimal("-2")
|
|
>>> ExtendedContext.normalize(Decimal('1.200'))
|
|
Decimal("1.2")
|
|
>>> ExtendedContext.normalize(Decimal('-120'))
|
|
Decimal("-1.2E+2")
|
|
>>> ExtendedContext.normalize(Decimal('120.00'))
|
|
Decimal("1.2E+2")
|
|
>>> ExtendedContext.normalize(Decimal('0.00'))
|
|
Decimal("0")
|
|
"""
|
|
return a.normalize(context=self)
|
|
|
|
def plus(self, a):
|
|
"""Plus corresponds to unary prefix plus in Python.
|
|
|
|
The operation is evaluated using the same rules as add; the
|
|
operation plus(a) is calculated as add('0', a) where the '0'
|
|
has the same exponent as the operand.
|
|
|
|
>>> ExtendedContext.plus(Decimal('1.3'))
|
|
Decimal("1.3")
|
|
>>> ExtendedContext.plus(Decimal('-1.3'))
|
|
Decimal("-1.3")
|
|
"""
|
|
return a.__pos__(context=self)
|
|
|
|
def power(self, a, b, modulo=None):
|
|
"""Raises a to the power of b, to modulo if given.
|
|
|
|
The right-hand operand must be a whole number whose integer part (after
|
|
any exponent has been applied) has no more than 9 digits and whose
|
|
fractional part (if any) is all zeros before any rounding. The operand
|
|
may be positive, negative, or zero; if negative, the absolute value of
|
|
the power is used, and the left-hand operand is inverted (divided into
|
|
1) before use.
|
|
|
|
If the increased precision needed for the intermediate calculations
|
|
exceeds the capabilities of the implementation then an Invalid operation
|
|
condition is raised.
|
|
|
|
If, when raising to a negative power, an underflow occurs during the
|
|
division into 1, the operation is not halted at that point but
|
|
continues.
|
|
|
|
>>> ExtendedContext.power(Decimal('2'), Decimal('3'))
|
|
Decimal("8")
|
|
>>> ExtendedContext.power(Decimal('2'), Decimal('-3'))
|
|
Decimal("0.125")
|
|
>>> ExtendedContext.power(Decimal('1.7'), Decimal('8'))
|
|
Decimal("69.7575744")
|
|
>>> ExtendedContext.power(Decimal('Infinity'), Decimal('-2'))
|
|
Decimal("0")
|
|
>>> ExtendedContext.power(Decimal('Infinity'), Decimal('-1'))
|
|
Decimal("0")
|
|
>>> ExtendedContext.power(Decimal('Infinity'), Decimal('0'))
|
|
Decimal("1")
|
|
>>> ExtendedContext.power(Decimal('Infinity'), Decimal('1'))
|
|
Decimal("Infinity")
|
|
>>> ExtendedContext.power(Decimal('Infinity'), Decimal('2'))
|
|
Decimal("Infinity")
|
|
>>> ExtendedContext.power(Decimal('-Infinity'), Decimal('-2'))
|
|
Decimal("0")
|
|
>>> ExtendedContext.power(Decimal('-Infinity'), Decimal('-1'))
|
|
Decimal("-0")
|
|
>>> ExtendedContext.power(Decimal('-Infinity'), Decimal('0'))
|
|
Decimal("1")
|
|
>>> ExtendedContext.power(Decimal('-Infinity'), Decimal('1'))
|
|
Decimal("-Infinity")
|
|
>>> ExtendedContext.power(Decimal('-Infinity'), Decimal('2'))
|
|
Decimal("Infinity")
|
|
>>> ExtendedContext.power(Decimal('0'), Decimal('0'))
|
|
Decimal("NaN")
|
|
"""
|
|
return a.__pow__(b, modulo, context=self)
|
|
|
|
def quantize(self, a, b):
|
|
"""Returns a value equal to 'a' (rounded) and having the exponent of 'b'.
|
|
|
|
The coefficient of the result is derived from that of the left-hand
|
|
operand. It may be rounded using the current rounding setting (if the
|
|
exponent is being increased), multiplied by a positive power of ten (if
|
|
the exponent is being decreased), or is unchanged (if the exponent is
|
|
already equal to that of the right-hand operand).
|
|
|
|
Unlike other operations, if the length of the coefficient after the
|
|
quantize operation would be greater than precision then an Invalid
|
|
operation condition is raised. This guarantees that, unless there is an
|
|
error condition, the exponent of the result of a quantize is always
|
|
equal to that of the right-hand operand.
|
|
|
|
Also unlike other operations, quantize will never raise Underflow, even
|
|
if the result is subnormal and inexact.
|
|
|
|
>>> ExtendedContext.quantize(Decimal('2.17'), Decimal('0.001'))
|
|
Decimal("2.170")
|
|
>>> ExtendedContext.quantize(Decimal('2.17'), Decimal('0.01'))
|
|
Decimal("2.17")
|
|
>>> ExtendedContext.quantize(Decimal('2.17'), Decimal('0.1'))
|
|
Decimal("2.2")
|
|
>>> ExtendedContext.quantize(Decimal('2.17'), Decimal('1e+0'))
|
|
Decimal("2")
|
|
>>> ExtendedContext.quantize(Decimal('2.17'), Decimal('1e+1'))
|
|
Decimal("0E+1")
|
|
>>> ExtendedContext.quantize(Decimal('-Inf'), Decimal('Infinity'))
|
|
Decimal("-Infinity")
|
|
>>> ExtendedContext.quantize(Decimal('2'), Decimal('Infinity'))
|
|
Decimal("NaN")
|
|
>>> ExtendedContext.quantize(Decimal('-0.1'), Decimal('1'))
|
|
Decimal("-0")
|
|
>>> ExtendedContext.quantize(Decimal('-0'), Decimal('1e+5'))
|
|
Decimal("-0E+5")
|
|
>>> ExtendedContext.quantize(Decimal('+35236450.6'), Decimal('1e-2'))
|
|
Decimal("NaN")
|
|
>>> ExtendedContext.quantize(Decimal('-35236450.6'), Decimal('1e-2'))
|
|
Decimal("NaN")
|
|
>>> ExtendedContext.quantize(Decimal('217'), Decimal('1e-1'))
|
|
Decimal("217.0")
|
|
>>> ExtendedContext.quantize(Decimal('217'), Decimal('1e-0'))
|
|
Decimal("217")
|
|
>>> ExtendedContext.quantize(Decimal('217'), Decimal('1e+1'))
|
|
Decimal("2.2E+2")
|
|
>>> ExtendedContext.quantize(Decimal('217'), Decimal('1e+2'))
|
|
Decimal("2E+2")
|
|
"""
|
|
return a.quantize(b, context=self)
|
|
|
|
def remainder(self, a, b):
|
|
"""Returns the remainder from integer division.
|
|
|
|
The result is the residue of the dividend after the operation of
|
|
calculating integer division as described for divide-integer, rounded to
|
|
precision digits if necessary. The sign of the result, if non-zero, is
|
|
the same as that of the original dividend.
|
|
|
|
This operation will fail under the same conditions as integer division
|
|
(that is, if integer division on the same two operands would fail, the
|
|
remainder cannot be calculated).
|
|
|
|
>>> ExtendedContext.remainder(Decimal('2.1'), Decimal('3'))
|
|
Decimal("2.1")
|
|
>>> ExtendedContext.remainder(Decimal('10'), Decimal('3'))
|
|
Decimal("1")
|
|
>>> ExtendedContext.remainder(Decimal('-10'), Decimal('3'))
|
|
Decimal("-1")
|
|
>>> ExtendedContext.remainder(Decimal('10.2'), Decimal('1'))
|
|
Decimal("0.2")
|
|
>>> ExtendedContext.remainder(Decimal('10'), Decimal('0.3'))
|
|
Decimal("0.1")
|
|
>>> ExtendedContext.remainder(Decimal('3.6'), Decimal('1.3'))
|
|
Decimal("1.0")
|
|
"""
|
|
return a.__mod__(b, context=self)
|
|
|
|
def remainder_near(self, a, b):
|
|
"""Returns to be "a - b * n", where n is the integer nearest the exact
|
|
value of "x / b" (if two integers are equally near then the even one
|
|
is chosen). If the result is equal to 0 then its sign will be the
|
|
sign of a.
|
|
|
|
This operation will fail under the same conditions as integer division
|
|
(that is, if integer division on the same two operands would fail, the
|
|
remainder cannot be calculated).
|
|
|
|
>>> ExtendedContext.remainder_near(Decimal('2.1'), Decimal('3'))
|
|
Decimal("-0.9")
|
|
>>> ExtendedContext.remainder_near(Decimal('10'), Decimal('6'))
|
|
Decimal("-2")
|
|
>>> ExtendedContext.remainder_near(Decimal('10'), Decimal('3'))
|
|
Decimal("1")
|
|
>>> ExtendedContext.remainder_near(Decimal('-10'), Decimal('3'))
|
|
Decimal("-1")
|
|
>>> ExtendedContext.remainder_near(Decimal('10.2'), Decimal('1'))
|
|
Decimal("0.2")
|
|
>>> ExtendedContext.remainder_near(Decimal('10'), Decimal('0.3'))
|
|
Decimal("0.1")
|
|
>>> ExtendedContext.remainder_near(Decimal('3.6'), Decimal('1.3'))
|
|
Decimal("-0.3")
|
|
"""
|
|
return a.remainder_near(b, context=self)
|
|
|
|
def same_quantum(self, a, b):
|
|
"""Returns True if the two operands have the same exponent.
|
|
|
|
The result is never affected by either the sign or the coefficient of
|
|
either operand.
|
|
|
|
>>> ExtendedContext.same_quantum(Decimal('2.17'), Decimal('0.001'))
|
|
False
|
|
>>> ExtendedContext.same_quantum(Decimal('2.17'), Decimal('0.01'))
|
|
True
|
|
>>> ExtendedContext.same_quantum(Decimal('2.17'), Decimal('1'))
|
|
False
|
|
>>> ExtendedContext.same_quantum(Decimal('Inf'), Decimal('-Inf'))
|
|
True
|
|
"""
|
|
return a.same_quantum(b)
|
|
|
|
def sqrt(self, a):
|
|
"""Returns the square root of a non-negative number to context precision.
|
|
|
|
If the result must be inexact, it is rounded using the round-half-even
|
|
algorithm.
|
|
|
|
>>> ExtendedContext.sqrt(Decimal('0'))
|
|
Decimal("0")
|
|
>>> ExtendedContext.sqrt(Decimal('-0'))
|
|
Decimal("-0")
|
|
>>> ExtendedContext.sqrt(Decimal('0.39'))
|
|
Decimal("0.624499800")
|
|
>>> ExtendedContext.sqrt(Decimal('100'))
|
|
Decimal("10")
|
|
>>> ExtendedContext.sqrt(Decimal('1'))
|
|
Decimal("1")
|
|
>>> ExtendedContext.sqrt(Decimal('1.0'))
|
|
Decimal("1.0")
|
|
>>> ExtendedContext.sqrt(Decimal('1.00'))
|
|
Decimal("1.0")
|
|
>>> ExtendedContext.sqrt(Decimal('7'))
|
|
Decimal("2.64575131")
|
|
>>> ExtendedContext.sqrt(Decimal('10'))
|
|
Decimal("3.16227766")
|
|
>>> ExtendedContext.prec
|
|
9
|
|
"""
|
|
return a.sqrt(context=self)
|
|
|
|
def subtract(self, a, b):
|
|
"""Return the difference between the two operands.
|
|
|
|
>>> ExtendedContext.subtract(Decimal('1.3'), Decimal('1.07'))
|
|
Decimal("0.23")
|
|
>>> ExtendedContext.subtract(Decimal('1.3'), Decimal('1.30'))
|
|
Decimal("0.00")
|
|
>>> ExtendedContext.subtract(Decimal('1.3'), Decimal('2.07'))
|
|
Decimal("-0.77")
|
|
"""
|
|
return a.__sub__(b, context=self)
|
|
|
|
def to_eng_string(self, a):
|
|
"""Converts a number to a string, using scientific notation.
|
|
|
|
The operation is not affected by the context.
|
|
"""
|
|
return a.to_eng_string(context=self)
|
|
|
|
def to_sci_string(self, a):
|
|
"""Converts a number to a string, using scientific notation.
|
|
|
|
The operation is not affected by the context.
|
|
"""
|
|
return a.__str__(context=self)
|
|
|
|
def to_integral(self, a):
|
|
"""Rounds to an integer.
|
|
|
|
When the operand has a negative exponent, the result is the same
|
|
as using the quantize() operation using the given operand as the
|
|
left-hand-operand, 1E+0 as the right-hand-operand, and the precision
|
|
of the operand as the precision setting, except that no flags will
|
|
be set. The rounding mode is taken from the context.
|
|
|
|
>>> ExtendedContext.to_integral(Decimal('2.1'))
|
|
Decimal("2")
|
|
>>> ExtendedContext.to_integral(Decimal('100'))
|
|
Decimal("100")
|
|
>>> ExtendedContext.to_integral(Decimal('100.0'))
|
|
Decimal("100")
|
|
>>> ExtendedContext.to_integral(Decimal('101.5'))
|
|
Decimal("102")
|
|
>>> ExtendedContext.to_integral(Decimal('-101.5'))
|
|
Decimal("-102")
|
|
>>> ExtendedContext.to_integral(Decimal('10E+5'))
|
|
Decimal("1.0E+6")
|
|
>>> ExtendedContext.to_integral(Decimal('7.89E+77'))
|
|
Decimal("7.89E+77")
|
|
>>> ExtendedContext.to_integral(Decimal('-Inf'))
|
|
Decimal("-Infinity")
|
|
"""
|
|
return a.to_integral(context=self)
|
|
|
|
class _WorkRep(object):
|
|
__slots__ = ('sign','int','exp')
|
|
# sign: 0 or 1
|
|
# int: int or long
|
|
# exp: None, int, or string
|
|
|
|
def __init__(self, value=None):
|
|
if value is None:
|
|
self.sign = None
|
|
self.int = 0
|
|
self.exp = None
|
|
elif isinstance(value, Decimal):
|
|
self.sign = value._sign
|
|
cum = 0
|
|
for digit in value._int:
|
|
cum = cum * 10 + digit
|
|
self.int = cum
|
|
self.exp = value._exp
|
|
else:
|
|
# assert isinstance(value, tuple)
|
|
self.sign = value[0]
|
|
self.int = value[1]
|
|
self.exp = value[2]
|
|
|
|
def __repr__(self):
|
|
return "(%r, %r, %r)" % (self.sign, self.int, self.exp)
|
|
|
|
__str__ = __repr__
|
|
|
|
|
|
|
|
def _normalize(op1, op2, shouldround = 0, prec = 0):
|
|
"""Normalizes op1, op2 to have the same exp and length of coefficient.
|
|
|
|
Done during addition.
|
|
"""
|
|
# Yes, the exponent is a long, but the difference between exponents
|
|
# must be an int-- otherwise you'd get a big memory problem.
|
|
numdigits = int(op1.exp - op2.exp)
|
|
if numdigits < 0:
|
|
numdigits = -numdigits
|
|
tmp = op2
|
|
other = op1
|
|
else:
|
|
tmp = op1
|
|
other = op2
|
|
|
|
|
|
if shouldround and numdigits > prec + 1:
|
|
# Big difference in exponents - check the adjusted exponents
|
|
tmp_len = len(str(tmp.int))
|
|
other_len = len(str(other.int))
|
|
if numdigits > (other_len + prec + 1 - tmp_len):
|
|
# If the difference in adjusted exps is > prec+1, we know
|
|
# other is insignificant, so might as well put a 1 after the precision.
|
|
# (since this is only for addition.) Also stops use of massive longs.
|
|
|
|
extend = prec + 2 - tmp_len
|
|
if extend <= 0:
|
|
extend = 1
|
|
tmp.int *= 10 ** extend
|
|
tmp.exp -= extend
|
|
other.int = 1
|
|
other.exp = tmp.exp
|
|
return op1, op2
|
|
|
|
tmp.int *= 10 ** numdigits
|
|
tmp.exp -= numdigits
|
|
return op1, op2
|
|
|
|
def _adjust_coefficients(op1, op2):
|
|
"""Adjust op1, op2 so that op2.int * 10 > op1.int >= op2.int.
|
|
|
|
Returns the adjusted op1, op2 as well as the change in op1.exp-op2.exp.
|
|
|
|
Used on _WorkRep instances during division.
|
|
"""
|
|
adjust = 0
|
|
#If op1 is smaller, make it larger
|
|
while op2.int > op1.int:
|
|
op1.int *= 10
|
|
op1.exp -= 1
|
|
adjust += 1
|
|
|
|
#If op2 is too small, make it larger
|
|
while op1.int >= (10 * op2.int):
|
|
op2.int *= 10
|
|
op2.exp -= 1
|
|
adjust -= 1
|
|
|
|
return op1, op2, adjust
|
|
|
|
##### Helper Functions ########################################
|
|
|
|
def _convert_other(other):
|
|
"""Convert other to Decimal.
|
|
|
|
Verifies that it's ok to use in an implicit construction.
|
|
"""
|
|
if isinstance(other, Decimal):
|
|
return other
|
|
if isinstance(other, (int, long)):
|
|
return Decimal(other)
|
|
return NotImplemented
|
|
|
|
_infinity_map = {
|
|
'inf' : 1,
|
|
'infinity' : 1,
|
|
'+inf' : 1,
|
|
'+infinity' : 1,
|
|
'-inf' : -1,
|
|
'-infinity' : -1
|
|
}
|
|
|
|
def _isinfinity(num):
|
|
"""Determines whether a string or float is infinity.
|
|
|
|
+1 for negative infinity; 0 for finite ; +1 for positive infinity
|
|
"""
|
|
num = str(num).lower()
|
|
return _infinity_map.get(num, 0)
|
|
|
|
def _isnan(num):
|
|
"""Determines whether a string or float is NaN
|
|
|
|
(1, sign, diagnostic info as string) => NaN
|
|
(2, sign, diagnostic info as string) => sNaN
|
|
0 => not a NaN
|
|
"""
|
|
num = str(num).lower()
|
|
if not num:
|
|
return 0
|
|
|
|
#get the sign, get rid of trailing [+-]
|
|
sign = 0
|
|
if num[0] == '+':
|
|
num = num[1:]
|
|
elif num[0] == '-': #elif avoids '+-nan'
|
|
num = num[1:]
|
|
sign = 1
|
|
|
|
if num.startswith('nan'):
|
|
if len(num) > 3 and not num[3:].isdigit(): #diagnostic info
|
|
return 0
|
|
return (1, sign, num[3:].lstrip('0'))
|
|
if num.startswith('snan'):
|
|
if len(num) > 4 and not num[4:].isdigit():
|
|
return 0
|
|
return (2, sign, num[4:].lstrip('0'))
|
|
return 0
|
|
|
|
|
|
##### Setup Specific Contexts ################################
|
|
|
|
# The default context prototype used by Context()
|
|
# Is mutable, so that new contexts can have different default values
|
|
|
|
DefaultContext = Context(
|
|
prec=28, rounding=ROUND_HALF_EVEN,
|
|
traps=[DivisionByZero, Overflow, InvalidOperation],
|
|
flags=[],
|
|
_rounding_decision=ALWAYS_ROUND,
|
|
Emax=999999999,
|
|
Emin=-999999999,
|
|
capitals=1
|
|
)
|
|
|
|
# Pre-made alternate contexts offered by the specification
|
|
# Don't change these; the user should be able to select these
|
|
# contexts and be able to reproduce results from other implementations
|
|
# of the spec.
|
|
|
|
BasicContext = Context(
|
|
prec=9, rounding=ROUND_HALF_UP,
|
|
traps=[DivisionByZero, Overflow, InvalidOperation, Clamped, Underflow],
|
|
flags=[],
|
|
)
|
|
|
|
ExtendedContext = Context(
|
|
prec=9, rounding=ROUND_HALF_EVEN,
|
|
traps=[],
|
|
flags=[],
|
|
)
|
|
|
|
|
|
##### Useful Constants (internal use only) ####################
|
|
|
|
#Reusable defaults
|
|
Inf = Decimal('Inf')
|
|
negInf = Decimal('-Inf')
|
|
|
|
#Infsign[sign] is infinity w/ that sign
|
|
Infsign = (Inf, negInf)
|
|
|
|
NaN = Decimal('NaN')
|
|
|
|
|
|
##### crud for parsing strings #################################
|
|
import re
|
|
|
|
# There's an optional sign at the start, and an optional exponent
|
|
# at the end. The exponent has an optional sign and at least one
|
|
# digit. In between, must have either at least one digit followed
|
|
# by an optional fraction, or a decimal point followed by at least
|
|
# one digit. Yuck.
|
|
|
|
_parser = re.compile(r"""
|
|
# \s*
|
|
(?P<sign>[-+])?
|
|
(
|
|
(?P<int>\d+) (\. (?P<frac>\d*))?
|
|
|
|
|
\. (?P<onlyfrac>\d+)
|
|
)
|
|
([eE](?P<exp>[-+]? \d+))?
|
|
# \s*
|
|
$
|
|
""", re.VERBOSE).match #Uncomment the \s* to allow leading or trailing spaces.
|
|
|
|
del re
|
|
|
|
# return sign, n, p s.t. float string value == -1**sign * n * 10**p exactly
|
|
|
|
def _string2exact(s):
|
|
m = _parser(s)
|
|
if m is None:
|
|
raise ValueError("invalid literal for Decimal: %r" % s)
|
|
|
|
if m.group('sign') == "-":
|
|
sign = 1
|
|
else:
|
|
sign = 0
|
|
|
|
exp = m.group('exp')
|
|
if exp is None:
|
|
exp = 0
|
|
else:
|
|
exp = int(exp)
|
|
|
|
intpart = m.group('int')
|
|
if intpart is None:
|
|
intpart = ""
|
|
fracpart = m.group('onlyfrac')
|
|
else:
|
|
fracpart = m.group('frac')
|
|
if fracpart is None:
|
|
fracpart = ""
|
|
|
|
exp -= len(fracpart)
|
|
|
|
mantissa = intpart + fracpart
|
|
tmp = map(int, mantissa)
|
|
backup = tmp
|
|
while tmp and tmp[0] == 0:
|
|
del tmp[0]
|
|
|
|
# It's a zero
|
|
if not tmp:
|
|
if backup:
|
|
return (sign, tuple(backup), exp)
|
|
return (sign, (0,), exp)
|
|
mantissa = tuple(tmp)
|
|
|
|
return (sign, mantissa, exp)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
import doctest, sys
|
|
doctest.testmod(sys.modules[__name__])
|