mirror of
https://github.com/python/cpython
synced 2024-09-22 15:33:46 +00:00
d8faa3654c
svn+ssh://pythondev@svn.python.org/python/trunk ........ r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines Do not copy free variables to locals in class namespaces. Fixes bug 1569356, but at the cost of a minor incompatibility in locals(). Add test that verifies that the class namespace is not polluted. Also clarify the behavior in the library docs. Along the way, cleaned up the dict_to_map and map_to_dict implementations and added some comments that explain what they do. ........ r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines Fix assertion. ........ r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines When printing an unraisable error, don't print exceptions. before the name. This duplicates the behavior whening normally printing exceptions. ........ r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line Markup fix ........ r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines SF #1669182, 2.5 was already fixed. Just assert in 2.6 since string exceptions are gone. ........ r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line Add some items ........ r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines Fix long-standing bug in name mangling for package imports Reported by Mike Verdone. ........ r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines tabify ........ r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines tabify Note that ast.c still has a mix of tabs and spaces, because it attempts to use four-space indents for more of the new code. ........ r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines whitespace normalization ........ r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines Add checking for a number of metaclass error conditions. We add some new rules that are required for preserving internal invariants of types. 1. If type (or a subclass of type) appears in bases, it must appear before any non-type bases. If a non-type base (like a regular new-style class) occurred first, it could trick type into allocating the new class an __dict__ which must be impossible. 2. There are several checks that are made of bases when creating a type. Those checks are now repeated when assigning to __bases__. We also add the restriction that assignment to __bases__ may not change the metaclass of the type. Add new tests for these cases and for a few other oddball errors that were no previously tested. Remove a crasher test that was fixed. Also some internal refactoring: Extract the code to find the most derived metaclass of a type and its bases. It is now needed in two places. Rewrite the TypeError checks in test_descr to use doctest. The tests now clearly show what exception they expect to see. ........ r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines Add news about changes to metaclasses and __bases__ error checking. ........ r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines Modify the segfaulting example to show why r53997 is not a solution to it. ........ r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines Add a test for instantiating SyntaxError with no arguments. ........ r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line Docstring nit. ........ r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line Prepare collections module for pure python code entries. ........ r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line Add collections.NamedTuple ........ r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line Add Pat and Eric for work on PEP 3101 in the sandbox ........ r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line Add NamedTuple ........ r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines Bug #1628895: some better tries to find HTML documentation in pydoc. ........ r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line Fix embarrassing typo and fix constantification of None ........ r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize. ........ r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines Fix a bug in test_dict and test_userdict, found at the PyPy sprint. ........ r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines Teach setup.py how to find Berkeley DB on Macs using MacPorts. ........ r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line note MacPorts/BerkDB change in setup.py ........ r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line Added Pete for 3101 too ........ r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line Minor corrections to docs, and an explanation comentary ........ r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines Patch #1674228: when assigning a slice (old-style), check for the sq_ass_slice instead of the sq_slice slot. ........ r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines Nit: a struct field is set to GenericAlloc, not GenericAlloc(). ........ r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1671450: add a section about subclassing builtin types to the "extending and embedding" tutorial. ........ r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1121142: Implement ZipFile.open. ........ r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the fix in #1674228. ........ r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1672481: fix bug in idlelib.MultiCall. ........ r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line Bug #1674503: close the file opened by execfile() in an error condition. ........ r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines Fix another reincarnation of bug #1576657 in defaultdict. ........ r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the defaultdict KeyError bug. ........ r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1663234: you can now run doctest on test files and modules using "python -m doctest [-v] filename ...". ........ r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #912410: Replace HTML entity references for attribute values in HTMLParser. ........ r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line patch 1673619 - identify extension modules which cannot be built ........ r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines Patch #1646728: datetime.fromtimestamp fails with negative fractional times. With unittest. Somebody please backport to 2.5. ........ r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines Fix cmp vs. key argument for list.sort. ........ r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines Small nit, found by Neal. ........ r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1602128: clarify that richcmp methods can return NotImplemented and should return True or False otherwise. ........ r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1638879: don't accept strings with embedded NUL bytes in long(). ........ r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1673121: update README wrt. OSX default shell. ........ r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1654417: make operator.{get,set,del}slice use the full range of Py_ssize_t. ........ r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines Patch for bug #1633621: if curses.resizeterm() or curses.resize_term() is called, update _curses.LINES, _curses.COLS, curses.LINES and curses.COLS. ........ r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines Document change to curses. ........ r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines Variant of patch #697613: don't exit the interpreter on a SystemExit exception if the -i command line option or PYTHONINSPECT environment variable is given, but break into the interactive interpreter just like on other exceptions or normal program exit. (backport) ........ r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines Patch #703779: unset __file__ in __main__ after running a file. This makes the filenames the warning module prints much more sensible when a PYTHONSTARTUP file is used. ........ r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines add versionadded info ........ r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler. ........ r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #1001604: glob.glob() now returns unicode filenames if it was given a unicode argument and os.listdir() returns unicode filenames. ........ r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines Patches #1550273, #1550272: fix a few bugs in unittest and add a comprehensive test suite for the module. ........ r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #787789: allow to pass custom TestRunner instances to unittest's main() function. ........ r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position. ........ r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', ''). ........ r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1675471: convert test_pty to unittest. ........ r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines Add some sanity checks to unittest.TestSuite's addTest(s) methods. Fixes #878275. ........ r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines Windows doesn't support negative timestamps. Skip the tests involving them if os.name == "nt". ........ r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines Add missing ) in parenthical remark. ........ r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines Fix #1676656: \em is different from \emph... ........ r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines Add a NEWS entry for rev. 54207,8. ........ r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line SF 1676321: empty() returned wrong result ........ r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order. ........ r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line SF #1637850: make_table in difflib did not work with unicode ........ r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1668482: don't use '-' in mkstemp ........ r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines Introduce test.test_support.TransientResource. It's a context manager to surround calls to resources that may or may not be available. Specifying the expected exception and attributes to be raised if the resource is not available prevents overly broad catching of exceptions. This is meant to help suppress spurious failures by raising test.test_support.ResourceDenied if the exception matches. It would probably be good to go through the various network tests and surround the calls to catch connection timeouts (as done with test_socket_ssl in this commit). ........ r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py ........ r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line Add NEWS item for patch #1481079 (r54234). ........ r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line Fix SF #1676971, Complex OverflowError has a typo ........ r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines Typo. ........ r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #957003: Implement smtplib.LMTP. ........ r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822. ........ r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0) returned string up to the first NUL character. ........ r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines Add Ziga Seilnacht. ........ r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError. ........ r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines Bug #1651235: When a tuple was passed to a ctypes function call, Python would crash instead of raising an error. The crash was caused by a section of code that should have been removed long ago, at that time ctypes had other ways to pass parameters to function calls. ........ r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line Hashing simplification pointed out by Thomas Wouters. ........ r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines * Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink. * Drop safe_remove() in favor of test_support.unlink(). * Fix the indentation of test_samefile so that it runs. ........ r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket. Will backport. ........ r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines Simplify a little by handling the TCP case first. Update to use predominant style of spaces around = in args list and print to stderr if debugging. ........ r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line Add proper attribution for a bug fix. ........ r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines Typos. ........ r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line Convert an assert to a raise so it works even in the presence of -O. ........ r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer. ........ r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines Add missing "return" statements in exception handler. ........ r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1675981: remove unreachable code from type.__new__() method. __dict__ and __weakref__ are removed from the slots tuple earlier in the code, in the loop that mangles slot names. Will backport. ........ r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number. Will backport. ........ r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line Fix resource leak reported in SF #1516995. ........ r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more stable FTP. Will backport. ........ r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the display name of an email address, e.g. Foo \tBar <foo@example.com> Test case added by Barry. ........ r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines Sane humans would call these invalid tests, but Andrew McNamara pointed out that given the inputs in these tests Excel does indeed produce the output these tests expect. Document that for future confused folks. ........ r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86. ........ r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines Patch #1677862: Require a space or tab after import in .pth files. ........ r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines Backport from Py3k branch: Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Had to change a few bits of the patch because classobjs and __methods__ are still in Py2.6. ........ r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #1678647: write a newline after printing an exception in any case, even when converting the value to a string failed. ........ r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1678088: convert test_operations to use unittest, fold the result into test_dict. ........ r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167. Will backport. ........ r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines Typo fix. ........ r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1670993: Refactor test_threadedtempfile.py to use unittest. ........ r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines Whitespace normalization. ........ r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines Add test.test_support.transient_internet . Returns a context manager that nests test.test_support.TransientResource context managers that capture exceptions raised when the Internet connection is flaky. Initially using in test_socket_ssl but should probably be expanded to cover any test that should not raise the captured exceptions if the Internet connection works. ........ r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines Fix a typo where the variable name was not updated. ........ r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line Add Jerry Seutter for a bunch of his recent patches refactoring tests ........ r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines Add some other acks for recent checkins: Brian Leair - 922167 Tomer Filiba - 1591665 Jeremy Jones - 1192590 ........ r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines Fix some style nits: * lines too long * wrong indentation * space after a function name * wrong function name in error string * simplifying some logic Also add an error check to PyDict_SetItemString. ........ r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines Typo and grammar fixes. ........ r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1679379: add documentation for fnmatch.translate(). ........ r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1642844: comments to clarify the complexobject constructor. ........ r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1668100: urllib2 now correctly raises URLError instead of OSError if accessing a local file via the file:// protocol fails. ........ r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1635454: the csv.DictWriter class now includes the offending field names in its exception message if you try to write a record with a dictionary containing fields not in the CSV field names list. ........ r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1555098: use str.join() instead of repeated string concatenation in robotparser. ........ r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to pydoc's help keywords. ........ r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1569798: fix a bug in distutils when building Python from a directory within sys.exec_prefix. ........ r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1449244: Support Unicode strings in email.message.Message.{set_charset,get_content_charset}. Will backport. ........ r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines This is the implementation of POSIX.1-2001 (pax) format read/write support. The TarInfo class now contains all necessary logic to process and create tar header data which has been moved there from the TarFile class. The fromtarfile() method was added. The new path and linkpath properties are aliases for the name and linkname attributes in correspondence to the pax naming scheme. The TarFile constructor and classmethods now accept a number of keyword arguments which could only be set as attributes before (e.g. dereference, ignore_zeros). The encoding and pax_headers arguments were added for pax support. There is a new tarinfo keyword argument that allows using subclassed TarInfo objects in TarFile. The boolean TarFile.posix attribute is deprecated, because now three tar formats are supported. Instead, the desired format for writing is specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT as the format keyword argument. This change affects TarInfo.tobuf() as well. The test suite has been heavily reorganized and partially rewritten. A new testtar.tar was added that contains sample data in many formats from 4 different tar programs. Some bugs and quirks that also have been fixed: Directory names do no longer have a trailing slash in TarInfo.name or TarFile.getnames(). Adding the same file twice does not create a hardlink file member. The TarFile constructor does no longer need a name argument. The TarFile._mode attribute was renamed to mode and contains either 'r', 'w' or 'a'. ........ r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines Bug #1622896: fix a rare corner case where the bz2 module raised an error in spite of a succesful compression. ........ r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines Quick fix for tests that fail on systems with an encoding other than 'iso8859-1'. ........ r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1603688: ConfigParser.SafeConfigParser now checks values that are set for invalid interpolation sequences that would lead to errors on reading back those values. ........ r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1581073: add a flag to textwrap that prevents the dropping of whitespace while wrapping. ........ r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1605192: list allowed states in error messages for imaplib. ........ r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter which can be set to False to prevent the default delete-on-close behavior. ........ r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines Add acks for recent patch checkins: Arvin Schnell - 1668482 S?\195?\169bastien Martini - 1481079 Heiko Wundram - 1491866 Damon Kohler - 1545011 Peter Parente - 1599845 Bjorn Lindqvist - 1678662 ........ r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines Acks for recent patches. ........ r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines Fix a tab. ........ r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1533909: the timeit module now accepts callables in addition to strings for the code to time and the setup code. Also added two convenience functions for instantiating a Timer and calling its methods. ........ r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1530482: add pydoc.render_doc() which returns the documentation for a thing instead of paging it to stdout, which pydoc.doc() does. ........ r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. ........ r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1444529: the builtin compile() now accepts keyword arguments. (backport) ........ r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line Add versionadded marker for ctypes.c_bool. ........ r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1393667: pdb now has a "run" command which restarts the debugged Python program, optionally with different arguments. ........ r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines Deprecate commands.getstatus(). ........ r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines NEWS entry for getstatus() deprecation. ........ r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1429539: pdb now correctly initializes the __main__ module for the debugged script, which means that imports from __main__ work correctly now. ........ r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #957650: "%var%" environment variable references are now properly expanded in ntpath.expandvars(), also "~user" home directory references are recognized and handled on Windows. ........ r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1194449: correctly detect unbound methods in pydoc. ........ r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters with ASCII value less than 32. Also, it correctly quotes dots only if they occur on a single line, as opposed to the previous behavior of quoting dots if they are the second character of any line. ........ r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line Inline PyImport_GetModulesReloading(). ........ r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines SF bug #1582282; decode_header() incorrectly splits not-conformant RFC 2047-like headers where there is no whitespace between encoded words. This fix changes the matching regexp to include a trailing lookahead assertion that the closing ?= must be followed by whitespace, newline, or end-of-string. This also changes the regexp to add the MULTILINE flag. ........ r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines correct order and names of the less often used keyword parameters. ........ r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9" now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform items are all OS X special API specific since OS X is unixy enough for these modules to be available out of the box. ........ r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines Bug #767111: fix long-standing bug in urllib which caused an AttributeError instead of an IOError when the server's response didn't contain a valid HTTP status line. ........ r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines Patch #1680015: Don't modify __slots__ tuple if it contains an unicode name. Remove a reference leak that happened if the name could not be converted to string. Will backport. ........ r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines Patch #1559413: Fix test_cmd_line if sys.executable contains a space. Will backport. ........ r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines Note how test_socket_ssl has various exceptions that deal with a flaky Net connection are silenced. ........ r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines Raise ResourceDenied in test_urllib2net when the Net connection goes bad. ........ r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line Wrap a long line and fix a typo (is -> if) ........ r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1680978: consistently use "alive" instead of "active" in the thread lib doc. ........ r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1681153: the wave module now closes a file object it opened if initialization failed. ........ r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1462488: prevent a segfault in object_reduce_ex() by splitting the implementation for __reduce__ and __reduce_ex__ into two separate functions. Fixes bug #931877. Will backport. ........ r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements. Will backport. ........ r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines Bug #1681228: the webbrowser module now correctly uses the default GNOME or KDE browser, depending on whether there is a session of one of those present. Also, it tries the Windows default browser before trying Mozilla variants. (backport) ........ r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines Patch #1273829: os.walk() now has a "followlinks" parameter. If set to True (which is not the default), it visits symlinks pointing to directories. ........ r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines Add \versionadded tag. ........ r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines RFE #1670167: fix in isinstance() docs. ........ r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines Patch #1623563: allow __class__ assignment for classes with __slots__. The old and the new class are still required to have the same slot names, but the order in which they are specified is not relevant. ........ r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines Whitespace cleanup. Also remove the empty lines from the previous check in. ........ r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines Remove warning: funcion declaration isn't a prototype ........ r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines Clean up formatting of this file. The file should now follow PEP 7, except that it uses 4 space indents (in the style of Py3k). This particular code would be really hard to read with the regular tab idents. Other changes: - reflow long lines - change multi-line conditionals to have test at end of line ........ r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line Patch #1676994: Refactor test_popen2 to use unittest. ........ r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line Remove test/output/test_popen2 (missed in r54417). ........ r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line Patch 1339796: add a relpath() function to os.path. ........ r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines Patch #1675423: PyComplex_AsCComplex() now tries to convert an object to complex using its __complex__() method before falling back to the __float__() method. Therefore, the functions in the cmath module now can operate on objects that define a __complex__() method. (backport) ........ r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines move note to the correct section ........ r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf. ........ r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1678339: test case for bug in difflib. ........ r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line Patch #1630118: add a SpooledTemporaryFile class to tempfile. ........ r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines Patch #1683328: fixes and enhancements for "unparse" demo. ........ r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line Add some doc that was left out from some change to platform.py ........ r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line Add a comment about 3k migration ........ r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line Get rid of deprecation warning when testing commands.getstatus() ........ r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines Try backing out 54407 to see if it corrects the problems on the Windows buildbots. This rev was backported, so we will need to keep both branches in sync, pending the outcome of the test after this checkin. ........ r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines Try to be a little more resilient to errors. This might help the test pass, but my guess is that it won't. I'm guessing that some other test is leaving this file open which means it can't be removed under Windows AFAIK. ........ r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines Try to get test_urllib to pass on Windows by closing the file. I'm guessing that's the problem. h.getfile() must be called *after* h.getreply() and the fp can be None. I'm not entirely convinced this is the best fix (or even correct). The buildbots will tell us if things improve or not. I don't know if this needs to be backported (assuming it actually works). ........ r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. ........ r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines Fix for glob.py if filesystem encoding is None. ........ r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line Remove unused file spotted by Paul Hankin ........ r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines Patch #1682205: a TypeError while unpacking an iterable is no longer masked by a generic one with the message "unpack non-sequence". ........ r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines New test for rev. 54407 which only uses directories under TESTFN. ........ r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines Patch #1684834: document some utility C API functions. ........ r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'. ........ r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line Add comments on maintenance of this file ........ r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line Fix sentence, and fix typo in example ........ r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line Put code examples at left margin instead of indenting them ........ r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line Minor clarification, saying that blocking means no timeout (from bug #882297) ........ r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines Bug #1675967: re patterns pickled with older Python versions can now be unpickled. Will backport. ........ r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line Add test and fix for fromkeys() optional argument. ........ r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines Bug #1685704: use -m switch in timeit docs. ........ r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines Back out "Patch #1643874: memory leak in ctypes fixed." The code in this patch leaves no way to give up the ownership of a BSTR instance. ........ r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines Explain the purpose of the b_needsfree flag (forward ported from release25-maint). ........ r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines - Bug #1683368: The object.__init__() and object.__new__() methods are now stricter in rejecting excess arguments. The only time when either allows excess arguments is when it is not overridden and the other one is. For backwards compatibility, when both are overridden, it is a deprecation warning (for now; maybe a Py3k warning later). When merging this into 3.0, the warnings should become errors. Note: without the change to string.py, lots of spurious warnings happen. What's going on there? ........ r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line Add Mark Dickinson for SF # 1675423. ........ r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}. Will backport. ........ r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines Bug #978833: Revert r50844, as it broke _socketobject.dup. Will backport. ........ r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines Add a type.__init__() method that enforces the same signature as type.__new__(), and then calls object.__init__(cls), just to be anal. This allows us to restore the code in string.py's _TemplateMetaclass that called super(...).__init__(name, bases, dct), which I commented out yesterday since it broke due to the stricter argument checking added to object.__init__(). ........ r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines Added a 'create_connect()' function to socket.py, which creates a connection with an optional timeout, and modified httplib.py to use this function in HTTPConnection. Applies patch 1676823. ........ r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines Add note about type.__init__(). ........ r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines Prevent creation (followed by a segfault) of array types when the size overflows the valid Py_ssize_t range. Check return values of PyMem_Malloc. Will backport to release25-maint. ........ r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines Surrounded with try/finally to socket's default timeout setting changes in the tests, so failing one test won't produce strange results in others. Also relaxed the timeout settings in the test (where actually the value didn't mean anything). ........ r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line Make test_relpath() pass on Windows. ........ r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines Patch #1489771: update syntax rules in Python Reference Manual. Python 2.5 added support for explicit relative import statements and yield expressions, which were missing in the manual. Also fix grammar productions that used the names from the Grammar file, markup that broke the generated grammar.txt, and wrap some lines that broke the pdf output. Will backport. ........ r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines Remove typo accent. ........ r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines Revert accidental change. ........ r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines Change the docs to no longer claim that unittest is preferred over doctest for regression tests. ........ r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines Redone the tests, using the infrastructure already present for threading and socket serving. ........ r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines Closing the HTTP connection after each test, and listening more. ........ r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines Added an optional timeout to FTP class. Also I started a test_ftplib.py file to test the ftp lib (right now I included a basic test, the timeout one, and nothing else). ........ r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines Some nits. ........ r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines Forgot to add the file before the previous commit, here go the ftplib tests. ........ r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines Added an optional timeout to poplib.POP3. Also created a test_poplib.py file with a basic test and the timeout ones. Docs are also updated. ........ r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines The basic test cases of poplib.py. ........ r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines Bug 1688393. Adds a control of negative values in socket.recvfrom, which caused an ugly crash. ........ r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines Added timeout to smtplib (to SMTP and SMTP_SSL). Also created the test_smtplib.py file, with a basic test and the timeout ones. Docs are updated too. ........ r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file. Thanks to Jerry Seutter for all three patches. ........ r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line Make test_zipfile clean up its temporary files properly. ........ r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines These are actually methods. ........ r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines In Windows' time.clock(), when QueryPerformanceFrequency() fails, the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC as for the POSIX implementation (thanks to #pypy). ........ r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines Added timout parameter to telnetlib.Telnet. Also created test_telnetlib.py with a basic test and timeout ones. Docs are also updated. ........ r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines Added the posibility to pass the timeout to FTP.connect, not only when instantiating the class. Docs and tests are updated. ........ r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line Bug #1688274: add documentation for C-level class objects. ........ r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines Bump the patch level version of distutils since there were a few bug fixes since the 2.5.0 release. ........ r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines Label name fix. ........ r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line Add item. (Oops, accidentally checked this in on my branch) ........ r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines repair string literal. ........ r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines Markup fix. ........ r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines Duplicate label fix. ........ r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines Typo fix. ........ r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line Fix method names. Will backport. ........ r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS returned by python-config if Python was built with --enable-shared because that prevented the shared library from being used. ........ r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line Shut up an occaisonal buildbot error due to test files being left around. ........ r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines SF #1685563, MSVCCompiler creates redundant and long PATH strings If MSVCCompiler.initialize() was called multiple times, the path would get duplicated. On Windows, this is a problem because the path is limited to 4k. There's no benefit in adding a path multiple times, so prevent that from occuring. We also normalize the path before checking for duplicates so things like /a and /a/ won't both be stored. Will backport. ........ r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines time.strptime's caching of its locale object was being recreated when the locale changed but not used during the function call it was recreated during. The test in this checkin is untested (OS X does not have the proper locale support for me to test), although the fix for the bug this deals with was tested by the OP (#1290505). Once the buildbots verify the test at least doesn't fail it becomes a backport candidate. ........ r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines Fix the test for recreating the locale cache object by not worrying about if one of the test locales cannot be set. ........ r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines Fix a lot of markup and meta-information glitches. ........ r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines Another fix. ........ r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines Lots of explicit class names for method and member descs. ........ r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines Explicit class names. ........ r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines Some semantic fixes. ........ r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines Remove bogus entry. ........ r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines Fix the class name of strings. ........ r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line SF #1693079: Cannot save empty array in shelve ........ r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines Array module's buffer interface can now handle empty arrays. ........ r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines Fix warnings about object.__init__() signature. Two (test_array and test_descr) were bug IMO; the third (copy_reg) is a work-around which recognizes that object.__init__() doesn't do anything. ........ r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line SF 1602378 Clarify docstrings for bisect ........ r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines SF #1382213: Tutorial section 9.5.1 ignores MRO for new-style classes ........ r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines - Fix an off-by-one bug in locale.strxfrm(). patch taken from http://bugs.debian.org/416934. ........ r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines Fix the strange case of \begin{methoddesc}[NNTP]{...} where \ifx#1\@undefined ended up comparing N and N, therefore executing the true part of the conditional, blowing up at \@undefined. ........ r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines Now using unittest for the tests infraestructure. Also split the tests in those who need the network, and that who doesn't. ........ r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines Move the functionality for catching warnings in test_warnings.py into a separate class to that reusing the functionality in test_structmembers.py doesn't rerun the tests from test_warnings.py. ........ r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines Document that CatchWarningTests is reused by test_structmembers.py. ........ r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines Add tests for the filename. Test that the stacklevel is handled correctly. ........ r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines Added a SSL server to test_socket_ssl.py to be able to test locally. Now, it checks if have openssl available and run those specific tests (it starts openssl at the beggining of all the tests and then kills it at the end). ........ r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines Implement a contextmanager test.test_support.catch_warning that can be used to catch the last warning issued by the warning framework. Change test_warnings.py and test_structmembers.py to use this new contextmanager. ........ r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines Changed the whole structure of startup and checking if the server is available. Hope to not get more false alarms. ........ r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines Fixed the way that the .pem files are looked for, and changed how to kill the process in win32 to use the _handle attribute. ........ r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines Fix a race condition in this test -- instead of assuming that it will take the test server thread at most 0.5 seconds to get ready, use an event variable. ........ r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line Clean up imports. ........ r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line Stop using test_support.verify(). ........ r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines Bug #1686475: Support stat'ing open files on Windows again. Will backport to 2.5. ........ r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line Make test_getopt use unittest. ........ r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line Make test_softspace use unittest. ........ r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines Fix WalkTests.test_traversal() on Windows. The cleanup in MakedirTests.setUp() can now be removed. ........ r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines Bug #1563759: struct.unpack doens't support buffer protocol objects ........ r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_long_future to use unittest. ........ r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_normalization to use unittest. ........ r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line Some grammar fixes ........ r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_stringprep to use unittest. ........ r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line Import cleanup in test_crypt. ........ r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_gc to use unittest. ........ r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_module to use unittest. ........ r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_fileinput to use unittest. ........ r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines Doc that file.next() has undefined behaviour when called on a file opened with 'w'. Closes bug #1569057. To be backported once 2.5 branch is unfrozen. ........ r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line Added optional timeout to SocketHandler.makeSocket (SF #1695948) ........ r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines Patch #1695862: remove old test directory that causes test_urllib failures on Windows buildbots. The change is a one time fix and will be removed after a successful buildbot run. ........ r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines Minor fix to the tests pass ok even with -O. ........ r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line Typo fix. ........ r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines General clean-up. Lot of margin corrections, comments, some typos. Exceptions now are raised in the new style. And a mockup class is now also new style. Thanks Santiago Pereson. ........ r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines Repair a duplicate label and some obsolete uses of \setindexsubitem. ........ r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line Add window.chgat() method, submitted via e-mail by Fabian Kreutz ........ r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line Point readers at the patch submission instructions ........ r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line Describe undocumented third argument to touchline() ........ r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines Add some missing NULL checks which trigger crashes on low-memory conditions. Found by Victor Stinner. Will backport when 2.5 branch is unfrozen. ........ r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line SF 1191699: Make slices picklable ........ r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines Exceptions are no longer old-style instances. Fix accordingly. ........ r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines Repair missing spaces after \UNIX. ........ r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line SF 1193128: Let str.translate(None) be an identity transformation ........ r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1698951: clarify deprecation message in rexec and Bastion ........ r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1695862: remove the cleanup code, now that Windows buildbots are green again. ........ r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the first chunk fed to the decoder started with a BOM, but was longer than 3 bytes. ........ r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines Port r54805 from python25-maint branch: Add code to read from master_fd in the parent, breaking when we get an OSError (EIO can occur on Linux) or there's no more data to read. Without this, test_pty.py can hang on the waitpid() because the child is blocking on the stdout write. This will definitely happen on Mac OS X and could potentially happen on other platforms. See the comment for details. ........ r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127 ........ r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line Fix potential crash in path manipulation on windows ........ r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore' is built before '_ctypes' is attempted. Will backport to 2.5 once it is unfrozen for 2.5.1. ........ r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines When __slots__ are set to a unicode string, make it work the same as setting a plain string, ie don't expand to single letter identifiers. ........ r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line SF #1701207, Fix bogus assertion (and test it!) ........ r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line Check the availability of the urlfetch resource earlier than before. ........ r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines Add Travis Oliphant. ........ r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines Silence a compiler warning about incompatible pointer types. ........ r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines SF #1703270, add missing declaration in readline.c to avoid compiler warning. ........ r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines Revert r53997 as per http://mail.python.org/pipermail/python-dev/2007-March/071796.html . I've kept a couple of still-valid extra tests in test_descr, but didn't bother to sort through the new comments and refactorings added in r53997 to see if some of them could be kept. If so, they could go in a follow-up check-in. ........ r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines Fix a usage of the dangerous pattern decref - modify field - incref. ........ r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines Add an optional address to copy the failure mails to. Detect a conflict in the only file that should have outstanding changes when this script is run. This doesn't matter on the trunk, but does when run on a branch. Trunk always has the date set to today in boilerplate.tex. Each time a release is cut with a different date, a conflict occurs. (We could copy a known good version, but then we would lose changes to this file.) ........ r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines Bug #1704790: bind name "sys" locally in __del__ method so that it is not cleared before __del__ is run. ........ r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines Added tests for other methods of SSL object. Now we cover all the object methods. This is the final step to close the #451607 bug. ........ r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines As specified in RFC 2616, 2xx code indicates that the client's request was successfully received, understood, and accepted. Now in these cases no error is raised. Also fixed tests. ........ r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line Convert PyUnit -> unittest. ........ r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line Remove code that hasn't been called in years. ........ r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line Fix SF #1703110, Incorrect example for add_password() (use uri, not host) ........ r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines Some new year updates. ........ r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines Added a comment about last change in urllib2.py (all 2xx responses are ok now). ........ r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines Bug #1705717: error in sys.argv docs. ........ r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file (as opposed to the command line) will now write file names ending in ".cpp" too. ........ r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line Fix markup ........ r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line Merge change 54909 from release25-maint: Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition ........ r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h ........ r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now. ........ r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines Patch #1698768: updated the "using Python on the Mac" intro. ........ r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines Markup fix. ........ r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines Whitespace normalization. Ugh, we really need to do this more often. You might want to review this change as it's my first time. Be gentle. :-) ........ r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule(). ........ r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing. ........ r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line Change test_support.have_unicode to use True/False instead of 1/0. ........ r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines Whitespace normalization. ........ r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line Import and raise statement cleanup. ........ r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line Convert test_ossaudiodev to use unittest. ........ r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line Fix an issue related to the unittest conversion. ........ r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line fix some markup errors ........ r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode(). Use this function in posixmodule.c when implementing fdopen(). This fixes test_subprocess.py for a VisualStudio 2005 compile. ........ r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line The locale "En" appears not to be valid on windows underi VisualStudio.2005. Added "English" to the test_locale.py to make the testsuite pass for that build ........ r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line Minor wording change on slicing aide-memoire. ........ r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line Accomodate 64 bit time_t in the _bsddb module. ........
3166 lines
106 KiB
Python
3166 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 this module is to support arithmetic using familiar
|
|
"schoolhouse" rules and to avoid some of the 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(object):
|
|
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 (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,int)):
|
|
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,int)) 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, int)):
|
|
return NotImplemented
|
|
return self.__cmp__(other) == 0
|
|
|
|
def __ne__(self, other):
|
|
if not isinstance(other, (Decimal, int, int)):
|
|
return NotImplemented
|
|
return self.__cmp__(other) != 0
|
|
|
|
def __lt__(self, other):
|
|
if not isinstance(other, (Decimal, int, int)):
|
|
return NotImplemented
|
|
return self.__cmp__(other) < 0
|
|
|
|
def __le__(self, other):
|
|
if not isinstance(other, (Decimal, int, int)):
|
|
return NotImplemented
|
|
return self.__cmp__(other) <= 0
|
|
|
|
def __gt__(self, other):
|
|
if not isinstance(other, (Decimal, int, int)):
|
|
return NotImplemented
|
|
return self.__cmp__(other) > 0
|
|
|
|
def __ge__(self, other):
|
|
if not isinstance(other, (Decimal, int, int)):
|
|
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
|
|
|
|
# Must be infinite, and incrementing makes no difference
|
|
return Decimal(self)
|
|
|
|
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
|
|
numbsquant = len(side.__add__(Decimal(1), context=context)._int)
|
|
if numbsquant >= 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 int(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)
|
|
c = context._raise_error(Overflow, 'above Emax', ans._sign)
|
|
return c
|
|
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])
|
|
if traps is not None and not isinstance(traps, dict):
|
|
traps = dict([(s,s in traps) for s in _signals])
|
|
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))
|
|
names = [f.__name__ for f, v in self.flags.items() if v]
|
|
s.append('flags=[' + ', '.join(names) + ']')
|
|
names = [t.__name__ for t, v in self.traps.items() if v]
|
|
s.append('traps=[' + ', '.join(names) + ']')
|
|
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), 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):
|
|
"""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, int)):
|
|
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
|
|
|
|
def _string2exact(s):
|
|
"""Return sign, n, p s.t.
|
|
|
|
Float string value == -1**sign * n * 10**p exactly
|
|
"""
|
|
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__])
|