mirror of
https://github.com/python/cpython.git
synced 2026-02-18 05:12:16 +00:00
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. ........
3730 lines
90 KiB
C
3730 lines
90 KiB
C
/* Long (arbitrary precision) integer object implementation */
|
|
|
|
/* XXX The functional organization of this file is terrible */
|
|
|
|
#include "Python.h"
|
|
#include "longintrepr.h"
|
|
|
|
#include <ctype.h>
|
|
|
|
#ifndef NSMALLPOSINTS
|
|
#define NSMALLPOSINTS 257
|
|
#endif
|
|
#ifndef NSMALLNEGINTS
|
|
#define NSMALLNEGINTS 5
|
|
#endif
|
|
#if NSMALLNEGINTS + NSMALLPOSINTS > 0
|
|
/* Small integers are preallocated in this array so that they
|
|
can be shared.
|
|
The integers that are preallocated are those in the range
|
|
-NSMALLNEGINTS (inclusive) to NSMALLPOSINTS (not inclusive).
|
|
*/
|
|
static PyLongObject small_ints[NSMALLNEGINTS + NSMALLPOSINTS];
|
|
#ifdef COUNT_ALLOCS
|
|
int quick_int_allocs, quick_neg_int_allocs;
|
|
#endif
|
|
|
|
static inline PyObject *
|
|
get_small_int(int ival)
|
|
{
|
|
PyObject *v = (PyObject*)(small_ints + ival + NSMALLNEGINTS);
|
|
Py_INCREF(v);
|
|
#ifdef COUNT_ALLOCS
|
|
if (ival >= 0)
|
|
quick_int_allocs++;
|
|
else
|
|
quick_neg_int_allocs++;
|
|
#endif
|
|
return v;
|
|
}
|
|
#define CHECK_SMALL_INT(ival) \
|
|
do if (-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS) { \
|
|
return get_small_int(ival); \
|
|
} while(0)
|
|
|
|
#else
|
|
#define CHECK_SMALL_INT(ival)
|
|
#endif
|
|
|
|
#define MEDIUM_VALUE(x) ((x)->ob_size < 0 ? -(x)->ob_digit[0] : ((x)->ob_size == 0 ? 0 : (x)->ob_digit[0]))
|
|
/* If a freshly-allocated long is already shared, it must
|
|
be a small integer, so negating it must go to PyLong_FromLong */
|
|
#define NEGATE(x) \
|
|
do if ((x)->ob_refcnt == 1) (x)->ob_size = -(x)->ob_size; \
|
|
else { PyObject* tmp=PyInt_FromLong(-MEDIUM_VALUE(x)); \
|
|
Py_DECREF(x); (x) = (PyLongObject*)tmp; } \
|
|
while(0)
|
|
/* For long multiplication, use the O(N**2) school algorithm unless
|
|
* both operands contain more than KARATSUBA_CUTOFF digits (this
|
|
* being an internal Python long digit, in base BASE).
|
|
*/
|
|
#define KARATSUBA_CUTOFF 70
|
|
#define KARATSUBA_SQUARE_CUTOFF (2 * KARATSUBA_CUTOFF)
|
|
|
|
/* For exponentiation, use the binary left-to-right algorithm
|
|
* unless the exponent contains more than FIVEARY_CUTOFF digits.
|
|
* In that case, do 5 bits at a time. The potential drawback is that
|
|
* a table of 2**5 intermediate results is computed.
|
|
*/
|
|
#define FIVEARY_CUTOFF 8
|
|
|
|
#define ABS(x) ((x) < 0 ? -(x) : (x))
|
|
|
|
#undef MIN
|
|
#undef MAX
|
|
#define MAX(x, y) ((x) < (y) ? (y) : (x))
|
|
#define MIN(x, y) ((x) > (y) ? (y) : (x))
|
|
|
|
/* Forward */
|
|
static PyLongObject *long_normalize(PyLongObject *);
|
|
static PyLongObject *mul1(PyLongObject *, wdigit);
|
|
static PyLongObject *muladd1(PyLongObject *, wdigit, wdigit);
|
|
static PyLongObject *divrem1(PyLongObject *, digit, digit *);
|
|
static PyObject *long_format(PyObject *aa, int base);
|
|
|
|
#define SIGCHECK(PyTryBlock) \
|
|
if (--_Py_Ticker < 0) { \
|
|
_Py_Ticker = _Py_CheckInterval; \
|
|
if (PyErr_CheckSignals()) PyTryBlock \
|
|
}
|
|
|
|
/* Normalize (remove leading zeros from) a long int object.
|
|
Doesn't attempt to free the storage--in most cases, due to the nature
|
|
of the algorithms used, this could save at most be one word anyway. */
|
|
|
|
static PyLongObject *
|
|
long_normalize(register PyLongObject *v)
|
|
{
|
|
Py_ssize_t j = ABS(v->ob_size);
|
|
Py_ssize_t i = j;
|
|
|
|
while (i > 0 && v->ob_digit[i-1] == 0)
|
|
--i;
|
|
if (i != j)
|
|
v->ob_size = (v->ob_size < 0) ? -(i) : i;
|
|
return v;
|
|
}
|
|
|
|
/* Allocate a new long int object with size digits.
|
|
Return NULL and set exception if we run out of memory. */
|
|
|
|
PyLongObject *
|
|
_PyLong_New(Py_ssize_t size)
|
|
{
|
|
PyLongObject *result;
|
|
/* Can't use sizeof(PyLongObject) here, since the
|
|
compiler takes padding at the end into account.
|
|
As the consequence, this would waste 2 bytes on
|
|
a 32-bit system, and 6 bytes on a 64-bit system.
|
|
This computation would be incorrect on systems
|
|
which have padding before the digits; with 16-bit
|
|
digits this should not happen. */
|
|
result = PyObject_MALLOC(sizeof(PyVarObject) +
|
|
size*sizeof(digit));
|
|
if (!result) {
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
return (PyLongObject*)PyObject_INIT_VAR(result, &PyLong_Type, size);
|
|
}
|
|
|
|
PyObject *
|
|
_PyLong_Copy(PyLongObject *src)
|
|
{
|
|
PyLongObject *result;
|
|
Py_ssize_t i;
|
|
|
|
assert(src != NULL);
|
|
i = src->ob_size;
|
|
if (i < 0)
|
|
i = -(i);
|
|
if (i < 2) {
|
|
int ival = src->ob_digit[0];
|
|
if (src->ob_size < 0)
|
|
ival = -ival;
|
|
CHECK_SMALL_INT(ival);
|
|
}
|
|
result = _PyLong_New(i);
|
|
if (result != NULL) {
|
|
result->ob_size = src->ob_size;
|
|
while (--i >= 0)
|
|
result->ob_digit[i] = src->ob_digit[i];
|
|
}
|
|
return (PyObject *)result;
|
|
}
|
|
|
|
/* Create a new long int object from a C long int */
|
|
|
|
PyObject *
|
|
PyLong_FromLong(long ival)
|
|
{
|
|
PyLongObject *v;
|
|
unsigned long t; /* unsigned so >> doesn't propagate sign bit */
|
|
int ndigits = 0;
|
|
int sign = 1;
|
|
|
|
CHECK_SMALL_INT(ival);
|
|
|
|
if (ival < 0) {
|
|
ival = -ival;
|
|
sign = -1;
|
|
}
|
|
|
|
/* Fast path for single-digits ints */
|
|
if (!(ival>>SHIFT)) {
|
|
v = _PyLong_New(1);
|
|
if (v) {
|
|
v->ob_size = sign;
|
|
v->ob_digit[0] = ival;
|
|
}
|
|
return (PyObject*)v;
|
|
}
|
|
|
|
/* 2 digits */
|
|
if (!(ival >> 2*SHIFT)) {
|
|
v = _PyLong_New(2);
|
|
if (v) {
|
|
v->ob_size = 2*sign;
|
|
v->ob_digit[0] = (digit)ival & MASK;
|
|
v->ob_digit[1] = ival >> SHIFT;
|
|
}
|
|
return (PyObject*)v;
|
|
}
|
|
|
|
/* Larger numbers: loop to determine number of digits */
|
|
t = (unsigned long)ival;
|
|
while (t) {
|
|
++ndigits;
|
|
t >>= SHIFT;
|
|
}
|
|
v = _PyLong_New(ndigits);
|
|
if (v != NULL) {
|
|
digit *p = v->ob_digit;
|
|
v->ob_size = ndigits*sign;
|
|
t = (unsigned long)ival;
|
|
while (t) {
|
|
*p++ = (digit)(t & MASK);
|
|
t >>= SHIFT;
|
|
}
|
|
}
|
|
return (PyObject *)v;
|
|
}
|
|
|
|
/* Create a new long int object from a C unsigned long int */
|
|
|
|
PyObject *
|
|
PyLong_FromUnsignedLong(unsigned long ival)
|
|
{
|
|
PyLongObject *v;
|
|
unsigned long t;
|
|
int ndigits = 0;
|
|
|
|
if (ival < BASE)
|
|
return PyLong_FromLong(ival);
|
|
/* Count the number of Python digits. */
|
|
t = (unsigned long)ival;
|
|
while (t) {
|
|
++ndigits;
|
|
t >>= SHIFT;
|
|
}
|
|
v = _PyLong_New(ndigits);
|
|
if (v != NULL) {
|
|
digit *p = v->ob_digit;
|
|
v->ob_size = ndigits;
|
|
while (ival) {
|
|
*p++ = (digit)(ival & MASK);
|
|
ival >>= SHIFT;
|
|
}
|
|
}
|
|
return (PyObject *)v;
|
|
}
|
|
|
|
/* Create a new long int object from a C double */
|
|
|
|
PyObject *
|
|
PyLong_FromDouble(double dval)
|
|
{
|
|
PyLongObject *v;
|
|
double frac;
|
|
int i, ndig, expo, neg;
|
|
neg = 0;
|
|
if (Py_IS_INFINITY(dval)) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"cannot convert float infinity to int");
|
|
return NULL;
|
|
}
|
|
CHECK_SMALL_INT((int)dval);
|
|
if (dval < 0.0) {
|
|
neg = 1;
|
|
dval = -dval;
|
|
}
|
|
frac = frexp(dval, &expo); /* dval = frac*2**expo; 0.0 <= frac < 1.0 */
|
|
if (expo <= 0)
|
|
return PyLong_FromLong(0L);
|
|
ndig = (expo-1) / SHIFT + 1; /* Number of 'digits' in result */
|
|
v = _PyLong_New(ndig);
|
|
if (v == NULL)
|
|
return NULL;
|
|
frac = ldexp(frac, (expo-1) % SHIFT + 1);
|
|
for (i = ndig; --i >= 0; ) {
|
|
long bits = (long)frac;
|
|
v->ob_digit[i] = (digit) bits;
|
|
frac = frac - (double)bits;
|
|
frac = ldexp(frac, SHIFT);
|
|
}
|
|
if (neg)
|
|
v->ob_size = -(v->ob_size);
|
|
return (PyObject *)v;
|
|
}
|
|
|
|
/* Checking for overflow in PyLong_AsLong is a PITA since C doesn't define
|
|
* anything about what happens when a signed integer operation overflows,
|
|
* and some compilers think they're doing you a favor by being "clever"
|
|
* then. The bit pattern for the largest postive signed long is
|
|
* (unsigned long)LONG_MAX, and for the smallest negative signed long
|
|
* it is abs(LONG_MIN), which we could write -(unsigned long)LONG_MIN.
|
|
* However, some other compilers warn about applying unary minus to an
|
|
* unsigned operand. Hence the weird "0-".
|
|
*/
|
|
#define PY_ABS_LONG_MIN (0-(unsigned long)LONG_MIN)
|
|
#define PY_ABS_SSIZE_T_MIN (0-(size_t)PY_SSIZE_T_MIN)
|
|
|
|
/* Get a C long int from a long int object.
|
|
Returns -1 and sets an error condition if overflow occurs. */
|
|
|
|
long
|
|
PyLong_AsLong(PyObject *vv)
|
|
{
|
|
/* This version by Tim Peters */
|
|
register PyLongObject *v;
|
|
unsigned long x, prev;
|
|
long res;
|
|
Py_ssize_t i;
|
|
int sign;
|
|
int do_decref = 0; /* if nb_int was called */
|
|
|
|
if (vv == NULL) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
|
|
if (!PyLong_Check(vv)) {
|
|
PyNumberMethods *nb;
|
|
if ((nb = vv->ob_type->tp_as_number) == NULL ||
|
|
nb->nb_int == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
return -1;
|
|
}
|
|
vv = (*nb->nb_int) (vv);
|
|
if (vv == NULL)
|
|
return -1;
|
|
do_decref = 1;
|
|
if (!PyLong_Check(vv)) {
|
|
Py_DECREF(vv);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"nb_int should return int object");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
res = -1;
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
|
|
switch (i) {
|
|
case -1:
|
|
res = -v->ob_digit[0];
|
|
break;
|
|
case 0:
|
|
res = 0;
|
|
break;
|
|
case 1:
|
|
res = v->ob_digit[0];
|
|
break;
|
|
default:
|
|
sign = 1;
|
|
x = 0;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -(i);
|
|
}
|
|
while (--i >= 0) {
|
|
prev = x;
|
|
x = (x << SHIFT) + v->ob_digit[i];
|
|
if ((x >> SHIFT) != prev) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"Python int too large to convert to C long");
|
|
goto exit;
|
|
}
|
|
}
|
|
/* Haven't lost any bits, but casting to long requires extra care
|
|
* (see comment above).
|
|
*/
|
|
if (x <= (unsigned long)LONG_MAX) {
|
|
res = (long)x * sign;
|
|
}
|
|
else if (sign < 0 && x == PY_ABS_LONG_MIN) {
|
|
res = LONG_MIN;
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"Python int too large to convert to C long");
|
|
}
|
|
}
|
|
exit:
|
|
if (do_decref) {
|
|
Py_DECREF(vv);
|
|
}
|
|
return res;
|
|
}
|
|
|
|
int
|
|
_PyLong_FitsInLong(PyObject *vv)
|
|
{
|
|
int size;
|
|
if (!PyLong_CheckExact(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return 0;
|
|
}
|
|
/* conservative estimate */
|
|
size = ((PyLongObject*)vv)->ob_size;
|
|
return -2 <= size && size <= 2;
|
|
}
|
|
|
|
/* Get a Py_ssize_t from a long int object.
|
|
Returns -1 and sets an error condition if overflow occurs. */
|
|
|
|
Py_ssize_t
|
|
PyLong_AsSsize_t(PyObject *vv) {
|
|
register PyLongObject *v;
|
|
size_t x, prev;
|
|
Py_ssize_t i;
|
|
int sign;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
switch (i) {
|
|
case -1: return -v->ob_digit[0];
|
|
case 0: return 0;
|
|
case 1: return v->ob_digit[0];
|
|
}
|
|
sign = 1;
|
|
x = 0;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -(i);
|
|
}
|
|
while (--i >= 0) {
|
|
prev = x;
|
|
x = (x << SHIFT) + v->ob_digit[i];
|
|
if ((x >> SHIFT) != prev)
|
|
goto overflow;
|
|
}
|
|
/* Haven't lost any bits, but casting to a signed type requires
|
|
* extra care (see comment above).
|
|
*/
|
|
if (x <= (size_t)PY_SSIZE_T_MAX) {
|
|
return (Py_ssize_t)x * sign;
|
|
}
|
|
else if (sign < 0 && x == PY_ABS_SSIZE_T_MIN) {
|
|
return PY_SSIZE_T_MIN;
|
|
}
|
|
/* else overflow */
|
|
|
|
overflow:
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"Python int too large to convert to C ssize_t");
|
|
return -1;
|
|
}
|
|
|
|
/* Get a C unsigned long int from a long int object.
|
|
Returns -1 and sets an error condition if overflow occurs. */
|
|
|
|
unsigned long
|
|
PyLong_AsUnsignedLong(PyObject *vv)
|
|
{
|
|
register PyLongObject *v;
|
|
unsigned long x, prev;
|
|
Py_ssize_t i;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return (unsigned long) -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
x = 0;
|
|
if (i < 0) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"can't convert negative value to unsigned int");
|
|
return (unsigned long) -1;
|
|
}
|
|
switch (i) {
|
|
case 0: return 0;
|
|
case 1: return v->ob_digit[0];
|
|
}
|
|
while (--i >= 0) {
|
|
prev = x;
|
|
x = (x << SHIFT) + v->ob_digit[i];
|
|
if ((x >> SHIFT) != prev) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"python int too large to convert to C unsigned long");
|
|
return (unsigned long) -1;
|
|
}
|
|
}
|
|
return x;
|
|
}
|
|
|
|
/* Get a C unsigned long int from a long int object.
|
|
Returns -1 and sets an error condition if overflow occurs. */
|
|
|
|
size_t
|
|
PyLong_AsSize_t(PyObject *vv)
|
|
{
|
|
register PyLongObject *v;
|
|
size_t x, prev;
|
|
Py_ssize_t i;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return (unsigned long) -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
x = 0;
|
|
if (i < 0) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"can't convert negative value to size_t");
|
|
return (size_t) -1;
|
|
}
|
|
switch (i) {
|
|
case 0: return 0;
|
|
case 1: return v->ob_digit[0];
|
|
}
|
|
while (--i >= 0) {
|
|
prev = x;
|
|
x = (x << SHIFT) + v->ob_digit[i];
|
|
if ((x >> SHIFT) != prev) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"Python int too large to convert to C size_t");
|
|
return (unsigned long) -1;
|
|
}
|
|
}
|
|
return x;
|
|
}
|
|
|
|
/* Get a C unsigned long int from a long int object, ignoring the high bits.
|
|
Returns -1 and sets an error condition if an error occurs. */
|
|
|
|
static unsigned long
|
|
_PyLong_AsUnsignedLongMask(PyObject *vv)
|
|
{
|
|
register PyLongObject *v;
|
|
unsigned long x;
|
|
Py_ssize_t i;
|
|
int sign;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return (unsigned long) -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
switch (i) {
|
|
case 0: return 0;
|
|
case 1: return v->ob_digit[0];
|
|
}
|
|
sign = 1;
|
|
x = 0;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -i;
|
|
}
|
|
while (--i >= 0) {
|
|
x = (x << SHIFT) + v->ob_digit[i];
|
|
}
|
|
return x * sign;
|
|
}
|
|
|
|
unsigned long
|
|
PyLong_AsUnsignedLongMask(register PyObject *op)
|
|
{
|
|
PyNumberMethods *nb;
|
|
PyLongObject *lo;
|
|
unsigned long val;
|
|
|
|
if (op && PyLong_Check(op))
|
|
return _PyLong_AsUnsignedLongMask(op);
|
|
|
|
if (op == NULL || (nb = op->ob_type->tp_as_number) == NULL ||
|
|
nb->nb_int == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
return (unsigned long)-1;
|
|
}
|
|
|
|
lo = (PyLongObject*) (*nb->nb_int) (op);
|
|
if (lo == NULL)
|
|
return (unsigned long)-1;
|
|
if (PyLong_Check(lo)) {
|
|
val = _PyLong_AsUnsignedLongMask((PyObject *)lo);
|
|
Py_DECREF(lo);
|
|
if (PyErr_Occurred())
|
|
return (unsigned long)-1;
|
|
return val;
|
|
}
|
|
else
|
|
{
|
|
Py_DECREF(lo);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"nb_int should return int object");
|
|
return (unsigned long)-1;
|
|
}
|
|
}
|
|
|
|
int
|
|
_PyLong_Sign(PyObject *vv)
|
|
{
|
|
PyLongObject *v = (PyLongObject *)vv;
|
|
|
|
assert(v != NULL);
|
|
assert(PyLong_Check(v));
|
|
|
|
return v->ob_size == 0 ? 0 : (v->ob_size < 0 ? -1 : 1);
|
|
}
|
|
|
|
size_t
|
|
_PyLong_NumBits(PyObject *vv)
|
|
{
|
|
PyLongObject *v = (PyLongObject *)vv;
|
|
size_t result = 0;
|
|
Py_ssize_t ndigits;
|
|
|
|
assert(v != NULL);
|
|
assert(PyLong_Check(v));
|
|
ndigits = ABS(v->ob_size);
|
|
assert(ndigits == 0 || v->ob_digit[ndigits - 1] != 0);
|
|
if (ndigits > 0) {
|
|
digit msd = v->ob_digit[ndigits - 1];
|
|
|
|
result = (ndigits - 1) * SHIFT;
|
|
if (result / SHIFT != (size_t)(ndigits - 1))
|
|
goto Overflow;
|
|
do {
|
|
++result;
|
|
if (result == 0)
|
|
goto Overflow;
|
|
msd >>= 1;
|
|
} while (msd);
|
|
}
|
|
return result;
|
|
|
|
Overflow:
|
|
PyErr_SetString(PyExc_OverflowError, "int has too many bits "
|
|
"to express in a platform size_t");
|
|
return (size_t)-1;
|
|
}
|
|
|
|
PyObject *
|
|
_PyLong_FromByteArray(const unsigned char* bytes, size_t n,
|
|
int little_endian, int is_signed)
|
|
{
|
|
const unsigned char* pstartbyte;/* LSB of bytes */
|
|
int incr; /* direction to move pstartbyte */
|
|
const unsigned char* pendbyte; /* MSB of bytes */
|
|
size_t numsignificantbytes; /* number of bytes that matter */
|
|
size_t ndigits; /* number of Python long digits */
|
|
PyLongObject* v; /* result */
|
|
int idigit = 0; /* next free index in v->ob_digit */
|
|
|
|
if (n == 0)
|
|
return PyLong_FromLong(0L);
|
|
|
|
if (little_endian) {
|
|
pstartbyte = bytes;
|
|
pendbyte = bytes + n - 1;
|
|
incr = 1;
|
|
}
|
|
else {
|
|
pstartbyte = bytes + n - 1;
|
|
pendbyte = bytes;
|
|
incr = -1;
|
|
}
|
|
|
|
if (is_signed)
|
|
is_signed = *pendbyte >= 0x80;
|
|
|
|
/* Compute numsignificantbytes. This consists of finding the most
|
|
significant byte. Leading 0 bytes are insignficant if the number
|
|
is positive, and leading 0xff bytes if negative. */
|
|
{
|
|
size_t i;
|
|
const unsigned char* p = pendbyte;
|
|
const int pincr = -incr; /* search MSB to LSB */
|
|
const unsigned char insignficant = is_signed ? 0xff : 0x00;
|
|
|
|
for (i = 0; i < n; ++i, p += pincr) {
|
|
if (*p != insignficant)
|
|
break;
|
|
}
|
|
numsignificantbytes = n - i;
|
|
/* 2's-comp is a bit tricky here, e.g. 0xff00 == -0x0100, so
|
|
actually has 2 significant bytes. OTOH, 0xff0001 ==
|
|
-0x00ffff, so we wouldn't *need* to bump it there; but we
|
|
do for 0xffff = -0x0001. To be safe without bothering to
|
|
check every case, bump it regardless. */
|
|
if (is_signed && numsignificantbytes < n)
|
|
++numsignificantbytes;
|
|
}
|
|
|
|
/* How many Python long digits do we need? We have
|
|
8*numsignificantbytes bits, and each Python long digit has SHIFT
|
|
bits, so it's the ceiling of the quotient. */
|
|
ndigits = (numsignificantbytes * 8 + SHIFT - 1) / SHIFT;
|
|
if (ndigits > (size_t)INT_MAX)
|
|
return PyErr_NoMemory();
|
|
v = _PyLong_New((int)ndigits);
|
|
if (v == NULL)
|
|
return NULL;
|
|
|
|
/* Copy the bits over. The tricky parts are computing 2's-comp on
|
|
the fly for signed numbers, and dealing with the mismatch between
|
|
8-bit bytes and (probably) 15-bit Python digits.*/
|
|
{
|
|
size_t i;
|
|
twodigits carry = 1; /* for 2's-comp calculation */
|
|
twodigits accum = 0; /* sliding register */
|
|
unsigned int accumbits = 0; /* number of bits in accum */
|
|
const unsigned char* p = pstartbyte;
|
|
|
|
for (i = 0; i < numsignificantbytes; ++i, p += incr) {
|
|
twodigits thisbyte = *p;
|
|
/* Compute correction for 2's comp, if needed. */
|
|
if (is_signed) {
|
|
thisbyte = (0xff ^ thisbyte) + carry;
|
|
carry = thisbyte >> 8;
|
|
thisbyte &= 0xff;
|
|
}
|
|
/* Because we're going LSB to MSB, thisbyte is
|
|
more significant than what's already in accum,
|
|
so needs to be prepended to accum. */
|
|
accum |= thisbyte << accumbits;
|
|
accumbits += 8;
|
|
if (accumbits >= SHIFT) {
|
|
/* There's enough to fill a Python digit. */
|
|
assert(idigit < (int)ndigits);
|
|
v->ob_digit[idigit] = (digit)(accum & MASK);
|
|
++idigit;
|
|
accum >>= SHIFT;
|
|
accumbits -= SHIFT;
|
|
assert(accumbits < SHIFT);
|
|
}
|
|
}
|
|
assert(accumbits < SHIFT);
|
|
if (accumbits) {
|
|
assert(idigit < (int)ndigits);
|
|
v->ob_digit[idigit] = (digit)accum;
|
|
++idigit;
|
|
}
|
|
}
|
|
|
|
v->ob_size = is_signed ? -idigit : idigit;
|
|
return (PyObject *)long_normalize(v);
|
|
}
|
|
|
|
int
|
|
_PyLong_AsByteArray(PyLongObject* v,
|
|
unsigned char* bytes, size_t n,
|
|
int little_endian, int is_signed)
|
|
{
|
|
int i; /* index into v->ob_digit */
|
|
Py_ssize_t ndigits; /* |v->ob_size| */
|
|
twodigits accum; /* sliding register */
|
|
unsigned int accumbits; /* # bits in accum */
|
|
int do_twos_comp; /* store 2's-comp? is_signed and v < 0 */
|
|
twodigits carry; /* for computing 2's-comp */
|
|
size_t j; /* # bytes filled */
|
|
unsigned char* p; /* pointer to next byte in bytes */
|
|
int pincr; /* direction to move p */
|
|
|
|
assert(v != NULL && PyLong_Check(v));
|
|
|
|
if (v->ob_size < 0) {
|
|
ndigits = -(v->ob_size);
|
|
if (!is_signed) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"can't convert negative int to unsigned");
|
|
return -1;
|
|
}
|
|
do_twos_comp = 1;
|
|
}
|
|
else {
|
|
ndigits = v->ob_size;
|
|
do_twos_comp = 0;
|
|
}
|
|
|
|
if (little_endian) {
|
|
p = bytes;
|
|
pincr = 1;
|
|
}
|
|
else {
|
|
p = bytes + n - 1;
|
|
pincr = -1;
|
|
}
|
|
|
|
/* Copy over all the Python digits.
|
|
It's crucial that every Python digit except for the MSD contribute
|
|
exactly SHIFT bits to the total, so first assert that the long is
|
|
normalized. */
|
|
assert(ndigits == 0 || v->ob_digit[ndigits - 1] != 0);
|
|
j = 0;
|
|
accum = 0;
|
|
accumbits = 0;
|
|
carry = do_twos_comp ? 1 : 0;
|
|
for (i = 0; i < ndigits; ++i) {
|
|
twodigits thisdigit = v->ob_digit[i];
|
|
if (do_twos_comp) {
|
|
thisdigit = (thisdigit ^ MASK) + carry;
|
|
carry = thisdigit >> SHIFT;
|
|
thisdigit &= MASK;
|
|
}
|
|
/* Because we're going LSB to MSB, thisdigit is more
|
|
significant than what's already in accum, so needs to be
|
|
prepended to accum. */
|
|
accum |= thisdigit << accumbits;
|
|
accumbits += SHIFT;
|
|
|
|
/* The most-significant digit may be (probably is) at least
|
|
partly empty. */
|
|
if (i == ndigits - 1) {
|
|
/* Count # of sign bits -- they needn't be stored,
|
|
* although for signed conversion we need later to
|
|
* make sure at least one sign bit gets stored.
|
|
* First shift conceptual sign bit to real sign bit.
|
|
*/
|
|
stwodigits s = (stwodigits)(thisdigit <<
|
|
(8*sizeof(stwodigits) - SHIFT));
|
|
unsigned int nsignbits = 0;
|
|
while ((s < 0) == do_twos_comp && nsignbits < SHIFT) {
|
|
++nsignbits;
|
|
s <<= 1;
|
|
}
|
|
accumbits -= nsignbits;
|
|
}
|
|
|
|
/* Store as many bytes as possible. */
|
|
while (accumbits >= 8) {
|
|
if (j >= n)
|
|
goto Overflow;
|
|
++j;
|
|
*p = (unsigned char)(accum & 0xff);
|
|
p += pincr;
|
|
accumbits -= 8;
|
|
accum >>= 8;
|
|
}
|
|
}
|
|
|
|
/* Store the straggler (if any). */
|
|
assert(accumbits < 8);
|
|
assert(carry == 0); /* else do_twos_comp and *every* digit was 0 */
|
|
if (accumbits > 0) {
|
|
if (j >= n)
|
|
goto Overflow;
|
|
++j;
|
|
if (do_twos_comp) {
|
|
/* Fill leading bits of the byte with sign bits
|
|
(appropriately pretending that the long had an
|
|
infinite supply of sign bits). */
|
|
accum |= (~(twodigits)0) << accumbits;
|
|
}
|
|
*p = (unsigned char)(accum & 0xff);
|
|
p += pincr;
|
|
}
|
|
else if (j == n && n > 0 && is_signed) {
|
|
/* The main loop filled the byte array exactly, so the code
|
|
just above didn't get to ensure there's a sign bit, and the
|
|
loop below wouldn't add one either. Make sure a sign bit
|
|
exists. */
|
|
unsigned char msb = *(p - pincr);
|
|
int sign_bit_set = msb >= 0x80;
|
|
assert(accumbits == 0);
|
|
if (sign_bit_set == do_twos_comp)
|
|
return 0;
|
|
else
|
|
goto Overflow;
|
|
}
|
|
|
|
/* Fill remaining bytes with copies of the sign bit. */
|
|
{
|
|
unsigned char signbyte = do_twos_comp ? 0xffU : 0U;
|
|
for ( ; j < n; ++j, p += pincr)
|
|
*p = signbyte;
|
|
}
|
|
|
|
return 0;
|
|
|
|
Overflow:
|
|
PyErr_SetString(PyExc_OverflowError, "int too big to convert");
|
|
return -1;
|
|
|
|
}
|
|
|
|
double
|
|
_PyLong_AsScaledDouble(PyObject *vv, int *exponent)
|
|
{
|
|
/* NBITS_WANTED should be > the number of bits in a double's precision,
|
|
but small enough so that 2**NBITS_WANTED is within the normal double
|
|
range. nbitsneeded is set to 1 less than that because the most-significant
|
|
Python digit contains at least 1 significant bit, but we don't want to
|
|
bother counting them (catering to the worst case cheaply).
|
|
|
|
57 is one more than VAX-D double precision; I (Tim) don't know of a double
|
|
format with more precision than that; it's 1 larger so that we add in at
|
|
least one round bit to stand in for the ignored least-significant bits.
|
|
*/
|
|
#define NBITS_WANTED 57
|
|
PyLongObject *v;
|
|
double x;
|
|
const double multiplier = (double)(1L << SHIFT);
|
|
Py_ssize_t i;
|
|
int sign;
|
|
int nbitsneeded;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
i = v->ob_size;
|
|
sign = 1;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -(i);
|
|
}
|
|
else if (i == 0) {
|
|
*exponent = 0;
|
|
return 0.0;
|
|
}
|
|
--i;
|
|
x = (double)v->ob_digit[i];
|
|
nbitsneeded = NBITS_WANTED - 1;
|
|
/* Invariant: i Python digits remain unaccounted for. */
|
|
while (i > 0 && nbitsneeded > 0) {
|
|
--i;
|
|
x = x * multiplier + (double)v->ob_digit[i];
|
|
nbitsneeded -= SHIFT;
|
|
}
|
|
/* There are i digits we didn't shift in. Pretending they're all
|
|
zeroes, the true value is x * 2**(i*SHIFT). */
|
|
*exponent = i;
|
|
assert(x > 0.0);
|
|
return x * sign;
|
|
#undef NBITS_WANTED
|
|
}
|
|
|
|
/* Get a C double from a long int object. */
|
|
|
|
double
|
|
PyLong_AsDouble(PyObject *vv)
|
|
{
|
|
int e = -1;
|
|
double x;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
x = _PyLong_AsScaledDouble(vv, &e);
|
|
if (x == -1.0 && PyErr_Occurred())
|
|
return -1.0;
|
|
/* 'e' initialized to -1 to silence gcc-4.0.x, but it should be
|
|
set correctly after a successful _PyLong_AsScaledDouble() call */
|
|
assert(e >= 0);
|
|
if (e > INT_MAX / SHIFT)
|
|
goto overflow;
|
|
errno = 0;
|
|
x = ldexp(x, e * SHIFT);
|
|
if (Py_OVERFLOWED(x))
|
|
goto overflow;
|
|
return x;
|
|
|
|
overflow:
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"Python int too large to convert to C double");
|
|
return -1.0;
|
|
}
|
|
|
|
/* Create a new long (or int) object from a C pointer */
|
|
|
|
PyObject *
|
|
PyLong_FromVoidPtr(void *p)
|
|
{
|
|
#ifndef HAVE_LONG_LONG
|
|
# error "PyLong_FromVoidPtr: sizeof(void*) > sizeof(long), but no long long"
|
|
#endif
|
|
#if SIZEOF_LONG_LONG < SIZEOF_VOID_P
|
|
# error "PyLong_FromVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)"
|
|
#endif
|
|
/* special-case null pointer */
|
|
if (!p)
|
|
return PyInt_FromLong(0);
|
|
return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)(Py_uintptr_t)p);
|
|
|
|
}
|
|
|
|
/* Get a C pointer from a long object (or an int object in some cases) */
|
|
|
|
void *
|
|
PyLong_AsVoidPtr(PyObject *vv)
|
|
{
|
|
/* This function will allow int or long objects. If vv is neither,
|
|
then the PyLong_AsLong*() functions will raise the exception:
|
|
PyExc_SystemError, "bad argument to internal function"
|
|
*/
|
|
#if SIZEOF_VOID_P <= SIZEOF_LONG
|
|
long x;
|
|
|
|
if (PyLong_Check(vv) && _PyLong_Sign(vv) < 0)
|
|
x = PyLong_AsLong(vv);
|
|
else
|
|
x = PyLong_AsUnsignedLong(vv);
|
|
#else
|
|
|
|
#ifndef HAVE_LONG_LONG
|
|
# error "PyLong_AsVoidPtr: sizeof(void*) > sizeof(long), but no long long"
|
|
#endif
|
|
#if SIZEOF_LONG_LONG < SIZEOF_VOID_P
|
|
# error "PyLong_AsVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)"
|
|
#endif
|
|
PY_LONG_LONG x;
|
|
|
|
if (PyLong_Check(vv) && _PyLong_Sign(vv) < 0)
|
|
x = PyLong_AsLongLong(vv);
|
|
else
|
|
x = PyLong_AsUnsignedLongLong(vv);
|
|
|
|
#endif /* SIZEOF_VOID_P <= SIZEOF_LONG */
|
|
|
|
if (x == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
return (void *)x;
|
|
}
|
|
|
|
#ifdef HAVE_LONG_LONG
|
|
|
|
/* Initial PY_LONG_LONG support by Chris Herborth (chrish@qnx.com), later
|
|
* rewritten to use the newer PyLong_{As,From}ByteArray API.
|
|
*/
|
|
|
|
#define IS_LITTLE_ENDIAN (int)*(unsigned char*)&one
|
|
|
|
/* Create a new long int object from a C PY_LONG_LONG int. */
|
|
|
|
PyObject *
|
|
PyLong_FromLongLong(PY_LONG_LONG ival)
|
|
{
|
|
PyLongObject *v;
|
|
unsigned PY_LONG_LONG t; /* unsigned so >> doesn't propagate sign bit */
|
|
int ndigits = 0;
|
|
int negative = 0;
|
|
|
|
CHECK_SMALL_INT(ival);
|
|
if (ival < 0) {
|
|
ival = -ival;
|
|
negative = 1;
|
|
}
|
|
|
|
/* Count the number of Python digits.
|
|
We used to pick 5 ("big enough for anything"), but that's a
|
|
waste of time and space given that 5*15 = 75 bits are rarely
|
|
needed. */
|
|
t = (unsigned PY_LONG_LONG)ival;
|
|
while (t) {
|
|
++ndigits;
|
|
t >>= SHIFT;
|
|
}
|
|
v = _PyLong_New(ndigits);
|
|
if (v != NULL) {
|
|
digit *p = v->ob_digit;
|
|
v->ob_size = negative ? -ndigits : ndigits;
|
|
t = (unsigned PY_LONG_LONG)ival;
|
|
while (t) {
|
|
*p++ = (digit)(t & MASK);
|
|
t >>= SHIFT;
|
|
}
|
|
}
|
|
return (PyObject *)v;
|
|
}
|
|
|
|
/* Create a new long int object from a C unsigned PY_LONG_LONG int. */
|
|
|
|
PyObject *
|
|
PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG ival)
|
|
{
|
|
PyLongObject *v;
|
|
unsigned PY_LONG_LONG t;
|
|
int ndigits = 0;
|
|
|
|
if (ival < BASE)
|
|
return PyLong_FromLong(ival);
|
|
/* Count the number of Python digits. */
|
|
t = (unsigned PY_LONG_LONG)ival;
|
|
while (t) {
|
|
++ndigits;
|
|
t >>= SHIFT;
|
|
}
|
|
v = _PyLong_New(ndigits);
|
|
if (v != NULL) {
|
|
digit *p = v->ob_digit;
|
|
v->ob_size = ndigits;
|
|
while (ival) {
|
|
*p++ = (digit)(ival & MASK);
|
|
ival >>= SHIFT;
|
|
}
|
|
}
|
|
return (PyObject *)v;
|
|
}
|
|
|
|
/* Create a new long int object from a C Py_ssize_t. */
|
|
|
|
PyObject *
|
|
PyLong_FromSsize_t(Py_ssize_t ival)
|
|
{
|
|
Py_ssize_t bytes = ival;
|
|
int one = 1;
|
|
if (ival < BASE)
|
|
return PyLong_FromLong(ival);
|
|
return _PyLong_FromByteArray(
|
|
(unsigned char *)&bytes,
|
|
SIZEOF_SIZE_T, IS_LITTLE_ENDIAN, 1);
|
|
}
|
|
|
|
/* Create a new long int object from a C size_t. */
|
|
|
|
PyObject *
|
|
PyLong_FromSize_t(size_t ival)
|
|
{
|
|
size_t bytes = ival;
|
|
int one = 1;
|
|
if (ival < BASE)
|
|
return PyLong_FromLong(ival);
|
|
return _PyLong_FromByteArray(
|
|
(unsigned char *)&bytes,
|
|
SIZEOF_SIZE_T, IS_LITTLE_ENDIAN, 0);
|
|
}
|
|
|
|
/* Get a C PY_LONG_LONG int from a long int object.
|
|
Return -1 and set an error if overflow occurs. */
|
|
|
|
PY_LONG_LONG
|
|
PyLong_AsLongLong(PyObject *vv)
|
|
{
|
|
PyLongObject *v;
|
|
PY_LONG_LONG bytes;
|
|
int one = 1;
|
|
int res;
|
|
|
|
if (vv == NULL) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
if (!PyLong_Check(vv)) {
|
|
PyNumberMethods *nb;
|
|
PyObject *io;
|
|
if ((nb = vv->ob_type->tp_as_number) == NULL ||
|
|
nb->nb_int == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
return -1;
|
|
}
|
|
io = (*nb->nb_int) (vv);
|
|
if (io == NULL)
|
|
return -1;
|
|
if (PyLong_Check(io)) {
|
|
bytes = PyLong_AsLongLong(io);
|
|
Py_DECREF(io);
|
|
return bytes;
|
|
}
|
|
Py_DECREF(io);
|
|
PyErr_SetString(PyExc_TypeError, "integer conversion failed");
|
|
return -1;
|
|
}
|
|
|
|
v = (PyLongObject*)vv;
|
|
switch(v->ob_size) {
|
|
case -1: return -v->ob_digit[0];
|
|
case 0: return 0;
|
|
case 1: return v->ob_digit[0];
|
|
}
|
|
res = _PyLong_AsByteArray(
|
|
(PyLongObject *)vv, (unsigned char *)&bytes,
|
|
SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 1);
|
|
|
|
/* Plan 9 can't handle PY_LONG_LONG in ? : expressions */
|
|
if (res < 0)
|
|
return (PY_LONG_LONG)-1;
|
|
else
|
|
return bytes;
|
|
}
|
|
|
|
/* Get a C unsigned PY_LONG_LONG int from a long int object.
|
|
Return -1 and set an error if overflow occurs. */
|
|
|
|
unsigned PY_LONG_LONG
|
|
PyLong_AsUnsignedLongLong(PyObject *vv)
|
|
{
|
|
PyLongObject *v;
|
|
unsigned PY_LONG_LONG bytes;
|
|
int one = 1;
|
|
int res;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return (unsigned PY_LONG_LONG)-1;
|
|
}
|
|
|
|
v = (PyLongObject*)vv;
|
|
switch(v->ob_size) {
|
|
case 0: return 0;
|
|
case 1: return v->ob_digit[0];
|
|
}
|
|
|
|
res = _PyLong_AsByteArray(
|
|
(PyLongObject *)vv, (unsigned char *)&bytes,
|
|
SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 0);
|
|
|
|
/* Plan 9 can't handle PY_LONG_LONG in ? : expressions */
|
|
if (res < 0)
|
|
return (unsigned PY_LONG_LONG)res;
|
|
else
|
|
return bytes;
|
|
}
|
|
|
|
/* Get a C unsigned long int from a long int object, ignoring the high bits.
|
|
Returns -1 and sets an error condition if an error occurs. */
|
|
|
|
static unsigned PY_LONG_LONG
|
|
_PyLong_AsUnsignedLongLongMask(PyObject *vv)
|
|
{
|
|
register PyLongObject *v;
|
|
unsigned PY_LONG_LONG x;
|
|
Py_ssize_t i;
|
|
int sign;
|
|
|
|
if (vv == NULL || !PyLong_Check(vv)) {
|
|
PyErr_BadInternalCall();
|
|
return (unsigned long) -1;
|
|
}
|
|
v = (PyLongObject *)vv;
|
|
switch(v->ob_size) {
|
|
case 0: return 0;
|
|
case 1: return v->ob_digit[0];
|
|
}
|
|
i = v->ob_size;
|
|
sign = 1;
|
|
x = 0;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -i;
|
|
}
|
|
while (--i >= 0) {
|
|
x = (x << SHIFT) + v->ob_digit[i];
|
|
}
|
|
return x * sign;
|
|
}
|
|
|
|
unsigned PY_LONG_LONG
|
|
PyLong_AsUnsignedLongLongMask(register PyObject *op)
|
|
{
|
|
PyNumberMethods *nb;
|
|
PyLongObject *lo;
|
|
unsigned PY_LONG_LONG val;
|
|
|
|
if (op && PyLong_Check(op))
|
|
return _PyLong_AsUnsignedLongLongMask(op);
|
|
|
|
if (op == NULL || (nb = op->ob_type->tp_as_number) == NULL ||
|
|
nb->nb_int == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
return (unsigned PY_LONG_LONG)-1;
|
|
}
|
|
|
|
lo = (PyLongObject*) (*nb->nb_int) (op);
|
|
if (lo == NULL)
|
|
return (unsigned PY_LONG_LONG)-1;
|
|
if (PyLong_Check(lo)) {
|
|
val = _PyLong_AsUnsignedLongLongMask((PyObject *)lo);
|
|
Py_DECREF(lo);
|
|
if (PyErr_Occurred())
|
|
return (unsigned PY_LONG_LONG)-1;
|
|
return val;
|
|
}
|
|
else
|
|
{
|
|
Py_DECREF(lo);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"nb_int should return int object");
|
|
return (unsigned PY_LONG_LONG)-1;
|
|
}
|
|
}
|
|
#undef IS_LITTLE_ENDIAN
|
|
|
|
#endif /* HAVE_LONG_LONG */
|
|
|
|
|
|
static int
|
|
convert_binop(PyObject *v, PyObject *w, PyLongObject **a, PyLongObject **b) {
|
|
if (PyLong_Check(v)) {
|
|
*a = (PyLongObject *) v;
|
|
Py_INCREF(v);
|
|
}
|
|
else {
|
|
return 0;
|
|
}
|
|
if (PyLong_Check(w)) {
|
|
*b = (PyLongObject *) w;
|
|
Py_INCREF(w);
|
|
}
|
|
else {
|
|
Py_DECREF(*a);
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
#define CONVERT_BINOP(v, w, a, b) \
|
|
if (!convert_binop(v, w, a, b)) { \
|
|
Py_INCREF(Py_NotImplemented); \
|
|
return Py_NotImplemented; \
|
|
}
|
|
|
|
/* x[0:m] and y[0:n] are digit vectors, LSD first, m >= n required. x[0:n]
|
|
* is modified in place, by adding y to it. Carries are propagated as far as
|
|
* x[m-1], and the remaining carry (0 or 1) is returned.
|
|
*/
|
|
static digit
|
|
v_iadd(digit *x, Py_ssize_t m, digit *y, Py_ssize_t n)
|
|
{
|
|
int i;
|
|
digit carry = 0;
|
|
|
|
assert(m >= n);
|
|
for (i = 0; i < n; ++i) {
|
|
carry += x[i] + y[i];
|
|
x[i] = carry & MASK;
|
|
carry >>= SHIFT;
|
|
assert((carry & 1) == carry);
|
|
}
|
|
for (; carry && i < m; ++i) {
|
|
carry += x[i];
|
|
x[i] = carry & MASK;
|
|
carry >>= SHIFT;
|
|
assert((carry & 1) == carry);
|
|
}
|
|
return carry;
|
|
}
|
|
|
|
/* x[0:m] and y[0:n] are digit vectors, LSD first, m >= n required. x[0:n]
|
|
* is modified in place, by subtracting y from it. Borrows are propagated as
|
|
* far as x[m-1], and the remaining borrow (0 or 1) is returned.
|
|
*/
|
|
static digit
|
|
v_isub(digit *x, Py_ssize_t m, digit *y, Py_ssize_t n)
|
|
{
|
|
int i;
|
|
digit borrow = 0;
|
|
|
|
assert(m >= n);
|
|
for (i = 0; i < n; ++i) {
|
|
borrow = x[i] - y[i] - borrow;
|
|
x[i] = borrow & MASK;
|
|
borrow >>= SHIFT;
|
|
borrow &= 1; /* keep only 1 sign bit */
|
|
}
|
|
for (; borrow && i < m; ++i) {
|
|
borrow = x[i] - borrow;
|
|
x[i] = borrow & MASK;
|
|
borrow >>= SHIFT;
|
|
borrow &= 1;
|
|
}
|
|
return borrow;
|
|
}
|
|
|
|
/* Multiply by a single digit, ignoring the sign. */
|
|
|
|
static PyLongObject *
|
|
mul1(PyLongObject *a, wdigit n)
|
|
{
|
|
return muladd1(a, n, (digit)0);
|
|
}
|
|
|
|
/* Multiply by a single digit and add a single digit, ignoring the sign. */
|
|
|
|
static PyLongObject *
|
|
muladd1(PyLongObject *a, wdigit n, wdigit extra)
|
|
{
|
|
Py_ssize_t size_a = ABS(a->ob_size);
|
|
PyLongObject *z = _PyLong_New(size_a+1);
|
|
twodigits carry = extra;
|
|
Py_ssize_t i;
|
|
|
|
if (z == NULL)
|
|
return NULL;
|
|
for (i = 0; i < size_a; ++i) {
|
|
carry += (twodigits)a->ob_digit[i] * n;
|
|
z->ob_digit[i] = (digit) (carry & MASK);
|
|
carry >>= SHIFT;
|
|
}
|
|
z->ob_digit[i] = (digit) carry;
|
|
return long_normalize(z);
|
|
}
|
|
|
|
/* Divide long pin, w/ size digits, by non-zero digit n, storing quotient
|
|
in pout, and returning the remainder. pin and pout point at the LSD.
|
|
It's OK for pin == pout on entry, which saves oodles of mallocs/frees in
|
|
long_format, but that should be done with great care since longs are
|
|
immutable. */
|
|
|
|
static digit
|
|
inplace_divrem1(digit *pout, digit *pin, Py_ssize_t size, digit n)
|
|
{
|
|
twodigits rem = 0;
|
|
|
|
assert(n > 0 && n <= MASK);
|
|
pin += size;
|
|
pout += size;
|
|
while (--size >= 0) {
|
|
digit hi;
|
|
rem = (rem << SHIFT) + *--pin;
|
|
*--pout = hi = (digit)(rem / n);
|
|
rem -= hi * n;
|
|
}
|
|
return (digit)rem;
|
|
}
|
|
|
|
/* Divide a long integer by a digit, returning both the quotient
|
|
(as function result) and the remainder (through *prem).
|
|
The sign of a is ignored; n should not be zero. */
|
|
|
|
static PyLongObject *
|
|
divrem1(PyLongObject *a, digit n, digit *prem)
|
|
{
|
|
const Py_ssize_t size = ABS(a->ob_size);
|
|
PyLongObject *z;
|
|
|
|
assert(n > 0 && n <= MASK);
|
|
z = _PyLong_New(size);
|
|
if (z == NULL)
|
|
return NULL;
|
|
*prem = inplace_divrem1(z->ob_digit, a->ob_digit, size, n);
|
|
return long_normalize(z);
|
|
}
|
|
|
|
/* Convert a long int object to a string, using a given conversion base.
|
|
Return a string object.
|
|
If base is 8 or 16, add the proper prefix '0' or '0x'. */
|
|
|
|
static PyObject *
|
|
long_format(PyObject *aa, int base)
|
|
{
|
|
register PyLongObject *a = (PyLongObject *)aa;
|
|
PyStringObject *str;
|
|
Py_ssize_t i, j, sz;
|
|
Py_ssize_t size_a;
|
|
char *p;
|
|
int bits;
|
|
char sign = '\0';
|
|
|
|
if (a == NULL || !PyLong_Check(a)) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
assert(base >= 2 && base <= 36);
|
|
size_a = ABS(a->ob_size);
|
|
|
|
/* Compute a rough upper bound for the length of the string */
|
|
i = base;
|
|
bits = 0;
|
|
while (i > 1) {
|
|
++bits;
|
|
i >>= 1;
|
|
}
|
|
i = 5;
|
|
j = size_a*SHIFT + bits-1;
|
|
sz = i + j / bits;
|
|
if (j / SHIFT < size_a || sz < i) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"int is too large to format");
|
|
return NULL;
|
|
}
|
|
str = (PyStringObject *) PyString_FromStringAndSize((char *)0, sz);
|
|
if (str == NULL)
|
|
return NULL;
|
|
p = PyString_AS_STRING(str) + sz;
|
|
*p = '\0';
|
|
if (a->ob_size < 0)
|
|
sign = '-';
|
|
|
|
if (a->ob_size == 0) {
|
|
*--p = '0';
|
|
}
|
|
else if ((base & (base - 1)) == 0) {
|
|
/* JRH: special case for power-of-2 bases */
|
|
twodigits accum = 0;
|
|
int accumbits = 0; /* # of bits in accum */
|
|
int basebits = 1; /* # of bits in base-1 */
|
|
i = base;
|
|
while ((i >>= 1) > 1)
|
|
++basebits;
|
|
|
|
for (i = 0; i < size_a; ++i) {
|
|
accum |= (twodigits)a->ob_digit[i] << accumbits;
|
|
accumbits += SHIFT;
|
|
assert(accumbits >= basebits);
|
|
do {
|
|
char cdigit = (char)(accum & (base - 1));
|
|
cdigit += (cdigit < 10) ? '0' : 'a'-10;
|
|
assert(p > PyString_AS_STRING(str));
|
|
*--p = cdigit;
|
|
accumbits -= basebits;
|
|
accum >>= basebits;
|
|
} while (i < size_a-1 ? accumbits >= basebits :
|
|
accum > 0);
|
|
}
|
|
}
|
|
else {
|
|
/* Not 0, and base not a power of 2. Divide repeatedly by
|
|
base, but for speed use the highest power of base that
|
|
fits in a digit. */
|
|
Py_ssize_t size = size_a;
|
|
digit *pin = a->ob_digit;
|
|
PyLongObject *scratch;
|
|
/* powbasw <- largest power of base that fits in a digit. */
|
|
digit powbase = base; /* powbase == base ** power */
|
|
int power = 1;
|
|
for (;;) {
|
|
unsigned long newpow = powbase * (unsigned long)base;
|
|
if (newpow >> SHIFT) /* doesn't fit in a digit */
|
|
break;
|
|
powbase = (digit)newpow;
|
|
++power;
|
|
}
|
|
|
|
/* Get a scratch area for repeated division. */
|
|
scratch = _PyLong_New(size);
|
|
if (scratch == NULL) {
|
|
Py_DECREF(str);
|
|
return NULL;
|
|
}
|
|
|
|
/* Repeatedly divide by powbase. */
|
|
do {
|
|
int ntostore = power;
|
|
digit rem = inplace_divrem1(scratch->ob_digit,
|
|
pin, size, powbase);
|
|
pin = scratch->ob_digit; /* no need to use a again */
|
|
if (pin[size - 1] == 0)
|
|
--size;
|
|
SIGCHECK({
|
|
Py_DECREF(scratch);
|
|
Py_DECREF(str);
|
|
return NULL;
|
|
})
|
|
|
|
/* Break rem into digits. */
|
|
assert(ntostore > 0);
|
|
do {
|
|
digit nextrem = (digit)(rem / base);
|
|
char c = (char)(rem - nextrem * base);
|
|
assert(p > PyString_AS_STRING(str));
|
|
c += (c < 10) ? '0' : 'a'-10;
|
|
*--p = c;
|
|
rem = nextrem;
|
|
--ntostore;
|
|
/* Termination is a bit delicate: must not
|
|
store leading zeroes, so must get out if
|
|
remaining quotient and rem are both 0. */
|
|
} while (ntostore && (size || rem));
|
|
} while (size != 0);
|
|
Py_DECREF(scratch);
|
|
}
|
|
|
|
if (base == 8) {
|
|
if (size_a != 0)
|
|
*--p = '0';
|
|
}
|
|
else if (base == 16) {
|
|
*--p = 'x';
|
|
*--p = '0';
|
|
}
|
|
else if (base != 10) {
|
|
*--p = '#';
|
|
*--p = '0' + base%10;
|
|
if (base > 10)
|
|
*--p = '0' + base/10;
|
|
}
|
|
if (sign)
|
|
*--p = sign;
|
|
if (p != PyString_AS_STRING(str)) {
|
|
char *q = PyString_AS_STRING(str);
|
|
assert(p > q);
|
|
do {
|
|
} while ((*q++ = *p++) != '\0');
|
|
q--;
|
|
_PyString_Resize((PyObject **)&str,
|
|
(Py_ssize_t) (q - PyString_AS_STRING(str)));
|
|
}
|
|
return (PyObject *)str;
|
|
}
|
|
|
|
/* Table of digit values for 8-bit string -> integer conversion.
|
|
* '0' maps to 0, ..., '9' maps to 9.
|
|
* 'a' and 'A' map to 10, ..., 'z' and 'Z' map to 35.
|
|
* All other indices map to 37.
|
|
* Note that when converting a base B string, a char c is a legitimate
|
|
* base B digit iff _PyLong_DigitValue[Py_CHARMASK(c)] < B.
|
|
*/
|
|
int _PyLong_DigitValue[256] = {
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 37, 37, 37, 37, 37, 37,
|
|
37, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
|
|
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 37, 37, 37, 37,
|
|
37, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
|
|
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
|
|
};
|
|
|
|
/* *str points to the first digit in a string of base `base` digits. base
|
|
* is a power of 2 (2, 4, 8, 16, or 32). *str is set to point to the first
|
|
* non-digit (which may be *str!). A normalized long is returned.
|
|
* The point to this routine is that it takes time linear in the number of
|
|
* string characters.
|
|
*/
|
|
static PyLongObject *
|
|
long_from_binary_base(char **str, int base)
|
|
{
|
|
char *p = *str;
|
|
char *start = p;
|
|
int bits_per_char;
|
|
Py_ssize_t n;
|
|
PyLongObject *z;
|
|
twodigits accum;
|
|
int bits_in_accum;
|
|
digit *pdigit;
|
|
|
|
assert(base >= 2 && base <= 32 && (base & (base - 1)) == 0);
|
|
n = base;
|
|
for (bits_per_char = -1; n; ++bits_per_char)
|
|
n >>= 1;
|
|
/* n <- total # of bits needed, while setting p to end-of-string */
|
|
n = 0;
|
|
while (_PyLong_DigitValue[Py_CHARMASK(*p)] < base)
|
|
++p;
|
|
*str = p;
|
|
/* n <- # of Python digits needed, = ceiling(n/SHIFT). */
|
|
n = (p - start) * bits_per_char + SHIFT - 1;
|
|
if (n / bits_per_char < p - start) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"int string too large to convert");
|
|
return NULL;
|
|
}
|
|
n = n / SHIFT;
|
|
z = _PyLong_New(n);
|
|
if (z == NULL)
|
|
return NULL;
|
|
/* Read string from right, and fill in long from left; i.e.,
|
|
* from least to most significant in both.
|
|
*/
|
|
accum = 0;
|
|
bits_in_accum = 0;
|
|
pdigit = z->ob_digit;
|
|
while (--p >= start) {
|
|
int k = _PyLong_DigitValue[Py_CHARMASK(*p)];
|
|
assert(k >= 0 && k < base);
|
|
accum |= (twodigits)(k << bits_in_accum);
|
|
bits_in_accum += bits_per_char;
|
|
if (bits_in_accum >= SHIFT) {
|
|
*pdigit++ = (digit)(accum & MASK);
|
|
assert(pdigit - z->ob_digit <= (int)n);
|
|
accum >>= SHIFT;
|
|
bits_in_accum -= SHIFT;
|
|
assert(bits_in_accum < SHIFT);
|
|
}
|
|
}
|
|
if (bits_in_accum) {
|
|
assert(bits_in_accum <= SHIFT);
|
|
*pdigit++ = (digit)accum;
|
|
assert(pdigit - z->ob_digit <= (int)n);
|
|
}
|
|
while (pdigit - z->ob_digit < n)
|
|
*pdigit++ = 0;
|
|
return long_normalize(z);
|
|
}
|
|
|
|
PyObject *
|
|
PyLong_FromString(char *str, char **pend, int base)
|
|
{
|
|
int sign = 1;
|
|
char *start, *orig_str = str;
|
|
PyLongObject *z;
|
|
PyObject *strobj, *strrepr;
|
|
Py_ssize_t slen;
|
|
|
|
if ((base != 0 && base < 2) || base > 36) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"int() arg 2 must be >= 2 and <= 36");
|
|
return NULL;
|
|
}
|
|
while (*str != '\0' && isspace(Py_CHARMASK(*str)))
|
|
str++;
|
|
if (*str == '+')
|
|
++str;
|
|
else if (*str == '-') {
|
|
++str;
|
|
sign = -1;
|
|
}
|
|
while (*str != '\0' && isspace(Py_CHARMASK(*str)))
|
|
str++;
|
|
if (base == 0) {
|
|
if (str[0] != '0')
|
|
base = 10;
|
|
else if (str[1] == 'x' || str[1] == 'X')
|
|
base = 16;
|
|
else
|
|
base = 8;
|
|
}
|
|
if (base == 16 && str[0] == '0' && (str[1] == 'x' || str[1] == 'X'))
|
|
str += 2;
|
|
|
|
start = str;
|
|
if ((base & (base - 1)) == 0)
|
|
z = long_from_binary_base(&str, base);
|
|
else {
|
|
/***
|
|
Binary bases can be converted in time linear in the number of digits, because
|
|
Python's representation base is binary. Other bases (including decimal!) use
|
|
the simple quadratic-time algorithm below, complicated by some speed tricks.
|
|
|
|
First some math: the largest integer that can be expressed in N base-B digits
|
|
is B**N-1. Consequently, if we have an N-digit input in base B, the worst-
|
|
case number of Python digits needed to hold it is the smallest integer n s.t.
|
|
|
|
BASE**n-1 >= B**N-1 [or, adding 1 to both sides]
|
|
BASE**n >= B**N [taking logs to base BASE]
|
|
n >= log(B**N)/log(BASE) = N * log(B)/log(BASE)
|
|
|
|
The static array log_base_BASE[base] == log(base)/log(BASE) so we can compute
|
|
this quickly. A Python long with that much space is reserved near the start,
|
|
and the result is computed into it.
|
|
|
|
The input string is actually treated as being in base base**i (i.e., i digits
|
|
are processed at a time), where two more static arrays hold:
|
|
|
|
convwidth_base[base] = the largest integer i such that base**i <= BASE
|
|
convmultmax_base[base] = base ** convwidth_base[base]
|
|
|
|
The first of these is the largest i such that i consecutive input digits
|
|
must fit in a single Python digit. The second is effectively the input
|
|
base we're really using.
|
|
|
|
Viewing the input as a sequence <c0, c1, ..., c_n-1> of digits in base
|
|
convmultmax_base[base], the result is "simply"
|
|
|
|
(((c0*B + c1)*B + c2)*B + c3)*B + ... ))) + c_n-1
|
|
|
|
where B = convmultmax_base[base].
|
|
|
|
Error analysis: as above, the number of Python digits `n` needed is worst-
|
|
case
|
|
|
|
n >= N * log(B)/log(BASE)
|
|
|
|
where `N` is the number of input digits in base `B`. This is computed via
|
|
|
|
size_z = (Py_ssize_t)((scan - str) * log_base_BASE[base]) + 1;
|
|
|
|
below. Two numeric concerns are how much space this can waste, and whether
|
|
the computed result can be too small. To be concrete, assume BASE = 2**15,
|
|
which is the default (and it's unlikely anyone changes that).
|
|
|
|
Waste isn't a problem: provided the first input digit isn't 0, the difference
|
|
between the worst-case input with N digits and the smallest input with N
|
|
digits is about a factor of B, but B is small compared to BASE so at most
|
|
one allocated Python digit can remain unused on that count. If
|
|
N*log(B)/log(BASE) is mathematically an exact integer, then truncating that
|
|
and adding 1 returns a result 1 larger than necessary. However, that can't
|
|
happen: whenever B is a power of 2, long_from_binary_base() is called
|
|
instead, and it's impossible for B**i to be an integer power of 2**15 when
|
|
B is not a power of 2 (i.e., it's impossible for N*log(B)/log(BASE) to be
|
|
an exact integer when B is not a power of 2, since B**i has a prime factor
|
|
other than 2 in that case, but (2**15)**j's only prime factor is 2).
|
|
|
|
The computed result can be too small if the true value of N*log(B)/log(BASE)
|
|
is a little bit larger than an exact integer, but due to roundoff errors (in
|
|
computing log(B), log(BASE), their quotient, and/or multiplying that by N)
|
|
yields a numeric result a little less than that integer. Unfortunately, "how
|
|
close can a transcendental function get to an integer over some range?"
|
|
questions are generally theoretically intractable. Computer analysis via
|
|
continued fractions is practical: expand log(B)/log(BASE) via continued
|
|
fractions, giving a sequence i/j of "the best" rational approximations. Then
|
|
j*log(B)/log(BASE) is approximately equal to (the integer) i. This shows that
|
|
we can get very close to being in trouble, but very rarely. For example,
|
|
76573 is a denominator in one of the continued-fraction approximations to
|
|
log(10)/log(2**15), and indeed:
|
|
|
|
>>> log(10)/log(2**15)*76573
|
|
16958.000000654003
|
|
|
|
is very close to an integer. If we were working with IEEE single-precision,
|
|
rounding errors could kill us. Finding worst cases in IEEE double-precision
|
|
requires better-than-double-precision log() functions, and Tim didn't bother.
|
|
Instead the code checks to see whether the allocated space is enough as each
|
|
new Python digit is added, and copies the whole thing to a larger long if not.
|
|
This should happen extremely rarely, and in fact I don't have a test case
|
|
that triggers it(!). Instead the code was tested by artificially allocating
|
|
just 1 digit at the start, so that the copying code was exercised for every
|
|
digit beyond the first.
|
|
***/
|
|
register twodigits c; /* current input character */
|
|
Py_ssize_t size_z;
|
|
int i;
|
|
int convwidth;
|
|
twodigits convmultmax, convmult;
|
|
digit *pz, *pzstop;
|
|
char* scan;
|
|
|
|
static double log_base_BASE[37] = {0.0e0,};
|
|
static int convwidth_base[37] = {0,};
|
|
static twodigits convmultmax_base[37] = {0,};
|
|
|
|
if (log_base_BASE[base] == 0.0) {
|
|
twodigits convmax = base;
|
|
int i = 1;
|
|
|
|
log_base_BASE[base] = log((double)base) /
|
|
log((double)BASE);
|
|
for (;;) {
|
|
twodigits next = convmax * base;
|
|
if (next > BASE)
|
|
break;
|
|
convmax = next;
|
|
++i;
|
|
}
|
|
convmultmax_base[base] = convmax;
|
|
assert(i > 0);
|
|
convwidth_base[base] = i;
|
|
}
|
|
|
|
/* Find length of the string of numeric characters. */
|
|
scan = str;
|
|
while (_PyLong_DigitValue[Py_CHARMASK(*scan)] < base)
|
|
++scan;
|
|
|
|
/* Create a long object that can contain the largest possible
|
|
* integer with this base and length. Note that there's no
|
|
* need to initialize z->ob_digit -- no slot is read up before
|
|
* being stored into.
|
|
*/
|
|
size_z = (Py_ssize_t)((scan - str) * log_base_BASE[base]) + 1;
|
|
/* Uncomment next line to test exceedingly rare copy code */
|
|
/* size_z = 1; */
|
|
assert(size_z > 0);
|
|
z = _PyLong_New(size_z);
|
|
if (z == NULL)
|
|
return NULL;
|
|
z->ob_size = 0;
|
|
|
|
/* `convwidth` consecutive input digits are treated as a single
|
|
* digit in base `convmultmax`.
|
|
*/
|
|
convwidth = convwidth_base[base];
|
|
convmultmax = convmultmax_base[base];
|
|
|
|
/* Work ;-) */
|
|
while (str < scan) {
|
|
/* grab up to convwidth digits from the input string */
|
|
c = (digit)_PyLong_DigitValue[Py_CHARMASK(*str++)];
|
|
for (i = 1; i < convwidth && str != scan; ++i, ++str) {
|
|
c = (twodigits)(c * base +
|
|
_PyLong_DigitValue[Py_CHARMASK(*str)]);
|
|
assert(c < BASE);
|
|
}
|
|
|
|
convmult = convmultmax;
|
|
/* Calculate the shift only if we couldn't get
|
|
* convwidth digits.
|
|
*/
|
|
if (i != convwidth) {
|
|
convmult = base;
|
|
for ( ; i > 1; --i)
|
|
convmult *= base;
|
|
}
|
|
|
|
/* Multiply z by convmult, and add c. */
|
|
pz = z->ob_digit;
|
|
pzstop = pz + z->ob_size;
|
|
for (; pz < pzstop; ++pz) {
|
|
c += (twodigits)*pz * convmult;
|
|
*pz = (digit)(c & MASK);
|
|
c >>= SHIFT;
|
|
}
|
|
/* carry off the current end? */
|
|
if (c) {
|
|
assert(c < BASE);
|
|
if (z->ob_size < size_z) {
|
|
*pz = (digit)c;
|
|
++z->ob_size;
|
|
}
|
|
else {
|
|
PyLongObject *tmp;
|
|
/* Extremely rare. Get more space. */
|
|
assert(z->ob_size == size_z);
|
|
tmp = _PyLong_New(size_z + 1);
|
|
if (tmp == NULL) {
|
|
Py_DECREF(z);
|
|
return NULL;
|
|
}
|
|
memcpy(tmp->ob_digit,
|
|
z->ob_digit,
|
|
sizeof(digit) * size_z);
|
|
Py_DECREF(z);
|
|
z = tmp;
|
|
z->ob_digit[size_z] = (digit)c;
|
|
++size_z;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (z == NULL)
|
|
return NULL;
|
|
if (str == start)
|
|
goto onError;
|
|
if (sign < 0)
|
|
z->ob_size = -(z->ob_size);
|
|
if (*str == 'L' || *str == 'l')
|
|
str++;
|
|
while (*str && isspace(Py_CHARMASK(*str)))
|
|
str++;
|
|
if (*str != '\0')
|
|
goto onError;
|
|
if (pend)
|
|
*pend = str;
|
|
return (PyObject *) z;
|
|
|
|
onError:
|
|
Py_XDECREF(z);
|
|
slen = strlen(orig_str) < 200 ? strlen(orig_str) : 200;
|
|
strobj = PyString_FromStringAndSize(orig_str, slen);
|
|
if (strobj == NULL)
|
|
return NULL;
|
|
strrepr = PyObject_Repr(strobj);
|
|
Py_DECREF(strobj);
|
|
if (strrepr == NULL)
|
|
return NULL;
|
|
PyErr_Format(PyExc_ValueError,
|
|
"invalid literal for int() with base %d: %s",
|
|
base, PyString_AS_STRING(strrepr));
|
|
Py_DECREF(strrepr);
|
|
return NULL;
|
|
}
|
|
|
|
#ifdef Py_USING_UNICODE
|
|
PyObject *
|
|
PyLong_FromUnicode(Py_UNICODE *u, Py_ssize_t length, int base)
|
|
{
|
|
PyObject *result;
|
|
char *buffer = (char *)PyMem_MALLOC(length+1);
|
|
|
|
if (buffer == NULL)
|
|
return NULL;
|
|
|
|
if (PyUnicode_EncodeDecimal(u, length, buffer, NULL)) {
|
|
PyMem_FREE(buffer);
|
|
return NULL;
|
|
}
|
|
result = PyLong_FromString(buffer, NULL, base);
|
|
PyMem_FREE(buffer);
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
/* forward */
|
|
static PyLongObject *x_divrem
|
|
(PyLongObject *, PyLongObject *, PyLongObject **);
|
|
static PyObject *long_pos(PyLongObject *);
|
|
static int long_divrem(PyLongObject *, PyLongObject *,
|
|
PyLongObject **, PyLongObject **);
|
|
|
|
/* Long division with remainder, top-level routine */
|
|
|
|
static int
|
|
long_divrem(PyLongObject *a, PyLongObject *b,
|
|
PyLongObject **pdiv, PyLongObject **prem)
|
|
{
|
|
Py_ssize_t size_a = ABS(a->ob_size), size_b = ABS(b->ob_size);
|
|
PyLongObject *z;
|
|
|
|
if (size_b == 0) {
|
|
PyErr_SetString(PyExc_ZeroDivisionError,
|
|
"integer division or modulo by zero");
|
|
return -1;
|
|
}
|
|
if (size_a < size_b ||
|
|
(size_a == size_b &&
|
|
a->ob_digit[size_a-1] < b->ob_digit[size_b-1])) {
|
|
/* |a| < |b|. */
|
|
*pdiv = (PyLongObject*)PyLong_FromLong(0);
|
|
if (*pdiv == NULL)
|
|
return -1;
|
|
Py_INCREF(a);
|
|
*prem = (PyLongObject *) a;
|
|
return 0;
|
|
}
|
|
if (size_b == 1) {
|
|
digit rem = 0;
|
|
z = divrem1(a, b->ob_digit[0], &rem);
|
|
if (z == NULL)
|
|
return -1;
|
|
*prem = (PyLongObject *) PyLong_FromLong((long)rem);
|
|
if (*prem == NULL) {
|
|
Py_DECREF(z);
|
|
return -1;
|
|
}
|
|
}
|
|
else {
|
|
z = x_divrem(a, b, prem);
|
|
if (z == NULL)
|
|
return -1;
|
|
}
|
|
/* Set the signs.
|
|
The quotient z has the sign of a*b;
|
|
the remainder r has the sign of a,
|
|
so a = b*z + r. */
|
|
if ((a->ob_size < 0) != (b->ob_size < 0))
|
|
NEGATE(z);
|
|
if (a->ob_size < 0 && (*prem)->ob_size != 0)
|
|
NEGATE(*prem);
|
|
*pdiv = z;
|
|
return 0;
|
|
}
|
|
|
|
/* Unsigned long division with remainder -- the algorithm */
|
|
|
|
static PyLongObject *
|
|
x_divrem(PyLongObject *v1, PyLongObject *w1, PyLongObject **prem)
|
|
{
|
|
Py_ssize_t size_v = ABS(v1->ob_size), size_w = ABS(w1->ob_size);
|
|
digit d = (digit) ((twodigits)BASE / (w1->ob_digit[size_w-1] + 1));
|
|
PyLongObject *v = mul1(v1, d);
|
|
PyLongObject *w = mul1(w1, d);
|
|
PyLongObject *a;
|
|
Py_ssize_t j, k;
|
|
|
|
if (v == NULL || w == NULL) {
|
|
Py_XDECREF(v);
|
|
Py_XDECREF(w);
|
|
return NULL;
|
|
}
|
|
|
|
assert(size_v >= size_w && size_w > 1); /* Assert checks by div() */
|
|
assert(v->ob_refcnt == 1); /* Since v will be used as accumulator! */
|
|
assert(size_w == ABS(w->ob_size)); /* That's how d was calculated */
|
|
|
|
size_v = ABS(v->ob_size);
|
|
k = size_v - size_w;
|
|
a = _PyLong_New(k + 1);
|
|
|
|
for (j = size_v; a != NULL && k >= 0; --j, --k) {
|
|
digit vj = (j >= size_v) ? 0 : v->ob_digit[j];
|
|
twodigits q;
|
|
stwodigits carry = 0;
|
|
int i;
|
|
|
|
SIGCHECK({
|
|
Py_DECREF(a);
|
|
a = NULL;
|
|
break;
|
|
})
|
|
if (vj == w->ob_digit[size_w-1])
|
|
q = MASK;
|
|
else
|
|
q = (((twodigits)vj << SHIFT) + v->ob_digit[j-1]) /
|
|
w->ob_digit[size_w-1];
|
|
|
|
while (w->ob_digit[size_w-2]*q >
|
|
((
|
|
((twodigits)vj << SHIFT)
|
|
+ v->ob_digit[j-1]
|
|
- q*w->ob_digit[size_w-1]
|
|
) << SHIFT)
|
|
+ v->ob_digit[j-2])
|
|
--q;
|
|
|
|
for (i = 0; i < size_w && i+k < size_v; ++i) {
|
|
twodigits z = w->ob_digit[i] * q;
|
|
digit zz = (digit) (z >> SHIFT);
|
|
carry += v->ob_digit[i+k] - z
|
|
+ ((twodigits)zz << SHIFT);
|
|
v->ob_digit[i+k] = (digit)(carry & MASK);
|
|
carry = Py_ARITHMETIC_RIGHT_SHIFT(BASE_TWODIGITS_TYPE,
|
|
carry, SHIFT);
|
|
carry -= zz;
|
|
}
|
|
|
|
if (i+k < size_v) {
|
|
carry += v->ob_digit[i+k];
|
|
v->ob_digit[i+k] = 0;
|
|
}
|
|
|
|
if (carry == 0)
|
|
a->ob_digit[k] = (digit) q;
|
|
else {
|
|
assert(carry == -1);
|
|
a->ob_digit[k] = (digit) q-1;
|
|
carry = 0;
|
|
for (i = 0; i < size_w && i+k < size_v; ++i) {
|
|
carry += v->ob_digit[i+k] + w->ob_digit[i];
|
|
v->ob_digit[i+k] = (digit)(carry & MASK);
|
|
carry = Py_ARITHMETIC_RIGHT_SHIFT(
|
|
BASE_TWODIGITS_TYPE,
|
|
carry, SHIFT);
|
|
}
|
|
}
|
|
} /* for j, k */
|
|
|
|
if (a == NULL)
|
|
*prem = NULL;
|
|
else {
|
|
a = long_normalize(a);
|
|
*prem = divrem1(v, d, &d);
|
|
/* d receives the (unused) remainder */
|
|
if (*prem == NULL) {
|
|
Py_DECREF(a);
|
|
a = NULL;
|
|
}
|
|
}
|
|
Py_DECREF(v);
|
|
Py_DECREF(w);
|
|
return a;
|
|
}
|
|
|
|
/* Methods */
|
|
|
|
static void
|
|
long_dealloc(PyObject *v)
|
|
{
|
|
v->ob_type->tp_free(v);
|
|
}
|
|
|
|
static PyObject *
|
|
long_repr(PyObject *v)
|
|
{
|
|
return long_format(v, 10);
|
|
}
|
|
|
|
static int
|
|
long_compare(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
Py_ssize_t sign;
|
|
|
|
if (a->ob_size != b->ob_size) {
|
|
if (ABS(a->ob_size) == 0 && ABS(b->ob_size) == 0)
|
|
sign = 0;
|
|
else
|
|
sign = a->ob_size - b->ob_size;
|
|
}
|
|
else {
|
|
Py_ssize_t i = ABS(a->ob_size);
|
|
while (--i >= 0 && a->ob_digit[i] == b->ob_digit[i])
|
|
;
|
|
if (i < 0)
|
|
sign = 0;
|
|
else {
|
|
sign = (int)a->ob_digit[i] - (int)b->ob_digit[i];
|
|
if (a->ob_size < 0)
|
|
sign = -sign;
|
|
}
|
|
}
|
|
return sign < 0 ? -1 : sign > 0 ? 1 : 0;
|
|
}
|
|
|
|
static PyObject *
|
|
long_richcompare(PyObject *self, PyObject *other, int op)
|
|
{
|
|
PyLongObject *a, *b;
|
|
PyObject *result;
|
|
CONVERT_BINOP((PyObject *)self, (PyObject *)other, &a, &b);
|
|
result = Py_CmpToRich(op, long_compare(a, b));
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return result;
|
|
}
|
|
|
|
static long
|
|
long_hash(PyLongObject *v)
|
|
{
|
|
long x;
|
|
Py_ssize_t i;
|
|
int sign;
|
|
|
|
/* This is designed so that Python ints and longs with the
|
|
same value hash to the same value, otherwise comparisons
|
|
of mapping keys will turn out weird */
|
|
i = v->ob_size;
|
|
switch(i) {
|
|
case -1: return v->ob_digit[0]==1 ? -2 : -v->ob_digit[0];
|
|
case 0: return 0;
|
|
case 1: return v->ob_digit[0];
|
|
}
|
|
sign = 1;
|
|
x = 0;
|
|
if (i < 0) {
|
|
sign = -1;
|
|
i = -(i);
|
|
}
|
|
#define LONG_BIT_SHIFT (8*sizeof(long) - SHIFT)
|
|
while (--i >= 0) {
|
|
/* Force a native long #-bits (32 or 64) circular shift */
|
|
x = ((x << SHIFT) & ~MASK) | ((x >> LONG_BIT_SHIFT) & MASK);
|
|
x += v->ob_digit[i];
|
|
}
|
|
#undef LONG_BIT_SHIFT
|
|
x = x * sign;
|
|
if (x == -1)
|
|
x = -2;
|
|
return x;
|
|
}
|
|
|
|
|
|
/* Add the absolute values of two long integers. */
|
|
|
|
static PyLongObject *
|
|
x_add(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
Py_ssize_t size_a = ABS(a->ob_size), size_b = ABS(b->ob_size);
|
|
PyLongObject *z;
|
|
int i;
|
|
digit carry = 0;
|
|
|
|
/* Ensure a is the larger of the two: */
|
|
if (size_a < size_b) {
|
|
{ PyLongObject *temp = a; a = b; b = temp; }
|
|
{ Py_ssize_t size_temp = size_a;
|
|
size_a = size_b;
|
|
size_b = size_temp; }
|
|
}
|
|
z = _PyLong_New(size_a+1);
|
|
if (z == NULL)
|
|
return NULL;
|
|
for (i = 0; i < size_b; ++i) {
|
|
carry += a->ob_digit[i] + b->ob_digit[i];
|
|
z->ob_digit[i] = carry & MASK;
|
|
carry >>= SHIFT;
|
|
}
|
|
for (; i < size_a; ++i) {
|
|
carry += a->ob_digit[i];
|
|
z->ob_digit[i] = carry & MASK;
|
|
carry >>= SHIFT;
|
|
}
|
|
z->ob_digit[i] = carry;
|
|
return long_normalize(z);
|
|
}
|
|
|
|
/* Subtract the absolute values of two integers. */
|
|
|
|
static PyLongObject *
|
|
x_sub(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
Py_ssize_t size_a = ABS(a->ob_size), size_b = ABS(b->ob_size);
|
|
PyLongObject *z;
|
|
Py_ssize_t i;
|
|
int sign = 1;
|
|
digit borrow = 0;
|
|
|
|
/* Ensure a is the larger of the two: */
|
|
if (size_a < size_b) {
|
|
sign = -1;
|
|
{ PyLongObject *temp = a; a = b; b = temp; }
|
|
{ Py_ssize_t size_temp = size_a;
|
|
size_a = size_b;
|
|
size_b = size_temp; }
|
|
}
|
|
else if (size_a == size_b) {
|
|
/* Find highest digit where a and b differ: */
|
|
i = size_a;
|
|
while (--i >= 0 && a->ob_digit[i] == b->ob_digit[i])
|
|
;
|
|
if (i < 0)
|
|
return _PyLong_New(0);
|
|
if (a->ob_digit[i] < b->ob_digit[i]) {
|
|
sign = -1;
|
|
{ PyLongObject *temp = a; a = b; b = temp; }
|
|
}
|
|
size_a = size_b = i+1;
|
|
}
|
|
z = _PyLong_New(size_a);
|
|
if (z == NULL)
|
|
return NULL;
|
|
for (i = 0; i < size_b; ++i) {
|
|
/* The following assumes unsigned arithmetic
|
|
works module 2**N for some N>SHIFT. */
|
|
borrow = a->ob_digit[i] - b->ob_digit[i] - borrow;
|
|
z->ob_digit[i] = borrow & MASK;
|
|
borrow >>= SHIFT;
|
|
borrow &= 1; /* Keep only one sign bit */
|
|
}
|
|
for (; i < size_a; ++i) {
|
|
borrow = a->ob_digit[i] - borrow;
|
|
z->ob_digit[i] = borrow & MASK;
|
|
borrow >>= SHIFT;
|
|
borrow &= 1; /* Keep only one sign bit */
|
|
}
|
|
assert(borrow == 0);
|
|
if (sign < 0)
|
|
NEGATE(z);
|
|
return long_normalize(z);
|
|
}
|
|
|
|
static PyObject *
|
|
long_add(PyLongObject *v, PyLongObject *w)
|
|
{
|
|
PyLongObject *a, *b, *z;
|
|
|
|
CONVERT_BINOP((PyObject *)v, (PyObject *)w, &a, &b);
|
|
|
|
if (ABS(a->ob_size) <= 1 && ABS(b->ob_size) <= 1) {
|
|
PyObject *result = PyInt_FromLong(MEDIUM_VALUE(a) +
|
|
MEDIUM_VALUE(b));
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return result;
|
|
}
|
|
if (a->ob_size < 0) {
|
|
if (b->ob_size < 0) {
|
|
z = x_add(a, b);
|
|
if (z != NULL && z->ob_size != 0)
|
|
z->ob_size = -(z->ob_size);
|
|
}
|
|
else
|
|
z = x_sub(b, a);
|
|
}
|
|
else {
|
|
if (b->ob_size < 0)
|
|
z = x_sub(a, b);
|
|
else
|
|
z = x_add(a, b);
|
|
}
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)z;
|
|
}
|
|
|
|
static PyObject *
|
|
long_sub(PyLongObject *v, PyLongObject *w)
|
|
{
|
|
PyLongObject *a, *b, *z;
|
|
|
|
CONVERT_BINOP((PyObject *)v, (PyObject *)w, &a, &b);
|
|
|
|
if (ABS(a->ob_size) <= 1 && ABS(b->ob_size) <= 1) {
|
|
PyObject* r;
|
|
r = PyLong_FromLong(MEDIUM_VALUE(a)-MEDIUM_VALUE(b));
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return r;
|
|
}
|
|
if (a->ob_size < 0) {
|
|
if (b->ob_size < 0)
|
|
z = x_sub(a, b);
|
|
else
|
|
z = x_add(a, b);
|
|
if (z != NULL && z->ob_size != 0)
|
|
z->ob_size = -(z->ob_size);
|
|
}
|
|
else {
|
|
if (b->ob_size < 0)
|
|
z = x_add(a, b);
|
|
else
|
|
z = x_sub(a, b);
|
|
}
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)z;
|
|
}
|
|
|
|
/* Grade school multiplication, ignoring the signs.
|
|
* Returns the absolute value of the product, or NULL if error.
|
|
*/
|
|
static PyLongObject *
|
|
x_mul(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
PyLongObject *z;
|
|
Py_ssize_t size_a = ABS(a->ob_size);
|
|
Py_ssize_t size_b = ABS(b->ob_size);
|
|
Py_ssize_t i;
|
|
|
|
z = _PyLong_New(size_a + size_b);
|
|
if (z == NULL)
|
|
return NULL;
|
|
|
|
memset(z->ob_digit, 0, z->ob_size * sizeof(digit));
|
|
if (a == b) {
|
|
/* Efficient squaring per HAC, Algorithm 14.16:
|
|
* http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
|
|
* Gives slightly less than a 2x speedup when a == b,
|
|
* via exploiting that each entry in the multiplication
|
|
* pyramid appears twice (except for the size_a squares).
|
|
*/
|
|
for (i = 0; i < size_a; ++i) {
|
|
twodigits carry;
|
|
twodigits f = a->ob_digit[i];
|
|
digit *pz = z->ob_digit + (i << 1);
|
|
digit *pa = a->ob_digit + i + 1;
|
|
digit *paend = a->ob_digit + size_a;
|
|
|
|
SIGCHECK({
|
|
Py_DECREF(z);
|
|
return NULL;
|
|
})
|
|
|
|
carry = *pz + f * f;
|
|
*pz++ = (digit)(carry & MASK);
|
|
carry >>= SHIFT;
|
|
assert(carry <= MASK);
|
|
|
|
/* Now f is added in twice in each column of the
|
|
* pyramid it appears. Same as adding f<<1 once.
|
|
*/
|
|
f <<= 1;
|
|
while (pa < paend) {
|
|
carry += *pz + *pa++ * f;
|
|
*pz++ = (digit)(carry & MASK);
|
|
carry >>= SHIFT;
|
|
assert(carry <= (MASK << 1));
|
|
}
|
|
if (carry) {
|
|
carry += *pz;
|
|
*pz++ = (digit)(carry & MASK);
|
|
carry >>= SHIFT;
|
|
}
|
|
if (carry)
|
|
*pz += (digit)(carry & MASK);
|
|
assert((carry >> SHIFT) == 0);
|
|
}
|
|
}
|
|
else { /* a is not the same as b -- gradeschool long mult */
|
|
for (i = 0; i < size_a; ++i) {
|
|
twodigits carry = 0;
|
|
twodigits f = a->ob_digit[i];
|
|
digit *pz = z->ob_digit + i;
|
|
digit *pb = b->ob_digit;
|
|
digit *pbend = b->ob_digit + size_b;
|
|
|
|
SIGCHECK({
|
|
Py_DECREF(z);
|
|
return NULL;
|
|
})
|
|
|
|
while (pb < pbend) {
|
|
carry += *pz + *pb++ * f;
|
|
*pz++ = (digit)(carry & MASK);
|
|
carry >>= SHIFT;
|
|
assert(carry <= MASK);
|
|
}
|
|
if (carry)
|
|
*pz += (digit)(carry & MASK);
|
|
assert((carry >> SHIFT) == 0);
|
|
}
|
|
}
|
|
return long_normalize(z);
|
|
}
|
|
|
|
/* A helper for Karatsuba multiplication (k_mul).
|
|
Takes a long "n" and an integer "size" representing the place to
|
|
split, and sets low and high such that abs(n) == (high << size) + low,
|
|
viewing the shift as being by digits. The sign bit is ignored, and
|
|
the return values are >= 0.
|
|
Returns 0 on success, -1 on failure.
|
|
*/
|
|
static int
|
|
kmul_split(PyLongObject *n, Py_ssize_t size, PyLongObject **high, PyLongObject **low)
|
|
{
|
|
PyLongObject *hi, *lo;
|
|
Py_ssize_t size_lo, size_hi;
|
|
const Py_ssize_t size_n = ABS(n->ob_size);
|
|
|
|
size_lo = MIN(size_n, size);
|
|
size_hi = size_n - size_lo;
|
|
|
|
if ((hi = _PyLong_New(size_hi)) == NULL)
|
|
return -1;
|
|
if ((lo = _PyLong_New(size_lo)) == NULL) {
|
|
Py_DECREF(hi);
|
|
return -1;
|
|
}
|
|
|
|
memcpy(lo->ob_digit, n->ob_digit, size_lo * sizeof(digit));
|
|
memcpy(hi->ob_digit, n->ob_digit + size_lo, size_hi * sizeof(digit));
|
|
|
|
*high = long_normalize(hi);
|
|
*low = long_normalize(lo);
|
|
return 0;
|
|
}
|
|
|
|
static PyLongObject *k_lopsided_mul(PyLongObject *a, PyLongObject *b);
|
|
|
|
/* Karatsuba multiplication. Ignores the input signs, and returns the
|
|
* absolute value of the product (or NULL if error).
|
|
* See Knuth Vol. 2 Chapter 4.3.3 (Pp. 294-295).
|
|
*/
|
|
static PyLongObject *
|
|
k_mul(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
Py_ssize_t asize = ABS(a->ob_size);
|
|
Py_ssize_t bsize = ABS(b->ob_size);
|
|
PyLongObject *ah = NULL;
|
|
PyLongObject *al = NULL;
|
|
PyLongObject *bh = NULL;
|
|
PyLongObject *bl = NULL;
|
|
PyLongObject *ret = NULL;
|
|
PyLongObject *t1, *t2, *t3;
|
|
Py_ssize_t shift; /* the number of digits we split off */
|
|
Py_ssize_t i;
|
|
|
|
/* (ah*X+al)(bh*X+bl) = ah*bh*X*X + (ah*bl + al*bh)*X + al*bl
|
|
* Let k = (ah+al)*(bh+bl) = ah*bl + al*bh + ah*bh + al*bl
|
|
* Then the original product is
|
|
* ah*bh*X*X + (k - ah*bh - al*bl)*X + al*bl
|
|
* By picking X to be a power of 2, "*X" is just shifting, and it's
|
|
* been reduced to 3 multiplies on numbers half the size.
|
|
*/
|
|
|
|
/* We want to split based on the larger number; fiddle so that b
|
|
* is largest.
|
|
*/
|
|
if (asize > bsize) {
|
|
t1 = a;
|
|
a = b;
|
|
b = t1;
|
|
|
|
i = asize;
|
|
asize = bsize;
|
|
bsize = i;
|
|
}
|
|
|
|
/* Use gradeschool math when either number is too small. */
|
|
i = a == b ? KARATSUBA_SQUARE_CUTOFF : KARATSUBA_CUTOFF;
|
|
if (asize <= i) {
|
|
if (asize == 0)
|
|
return _PyLong_New(0);
|
|
else
|
|
return x_mul(a, b);
|
|
}
|
|
|
|
/* If a is small compared to b, splitting on b gives a degenerate
|
|
* case with ah==0, and Karatsuba may be (even much) less efficient
|
|
* than "grade school" then. However, we can still win, by viewing
|
|
* b as a string of "big digits", each of width a->ob_size. That
|
|
* leads to a sequence of balanced calls to k_mul.
|
|
*/
|
|
if (2 * asize <= bsize)
|
|
return k_lopsided_mul(a, b);
|
|
|
|
/* Split a & b into hi & lo pieces. */
|
|
shift = bsize >> 1;
|
|
if (kmul_split(a, shift, &ah, &al) < 0) goto fail;
|
|
assert(ah->ob_size > 0); /* the split isn't degenerate */
|
|
|
|
if (a == b) {
|
|
bh = ah;
|
|
bl = al;
|
|
Py_INCREF(bh);
|
|
Py_INCREF(bl);
|
|
}
|
|
else if (kmul_split(b, shift, &bh, &bl) < 0) goto fail;
|
|
|
|
/* The plan:
|
|
* 1. Allocate result space (asize + bsize digits: that's always
|
|
* enough).
|
|
* 2. Compute ah*bh, and copy into result at 2*shift.
|
|
* 3. Compute al*bl, and copy into result at 0. Note that this
|
|
* can't overlap with #2.
|
|
* 4. Subtract al*bl from the result, starting at shift. This may
|
|
* underflow (borrow out of the high digit), but we don't care:
|
|
* we're effectively doing unsigned arithmetic mod
|
|
* BASE**(sizea + sizeb), and so long as the *final* result fits,
|
|
* borrows and carries out of the high digit can be ignored.
|
|
* 5. Subtract ah*bh from the result, starting at shift.
|
|
* 6. Compute (ah+al)*(bh+bl), and add it into the result starting
|
|
* at shift.
|
|
*/
|
|
|
|
/* 1. Allocate result space. */
|
|
ret = _PyLong_New(asize + bsize);
|
|
if (ret == NULL) goto fail;
|
|
#ifdef Py_DEBUG
|
|
/* Fill with trash, to catch reference to uninitialized digits. */
|
|
memset(ret->ob_digit, 0xDF, ret->ob_size * sizeof(digit));
|
|
#endif
|
|
|
|
/* 2. t1 <- ah*bh, and copy into high digits of result. */
|
|
if ((t1 = k_mul(ah, bh)) == NULL) goto fail;
|
|
assert(t1->ob_size >= 0);
|
|
assert(2*shift + t1->ob_size <= ret->ob_size);
|
|
memcpy(ret->ob_digit + 2*shift, t1->ob_digit,
|
|
t1->ob_size * sizeof(digit));
|
|
|
|
/* Zero-out the digits higher than the ah*bh copy. */
|
|
i = ret->ob_size - 2*shift - t1->ob_size;
|
|
if (i)
|
|
memset(ret->ob_digit + 2*shift + t1->ob_size, 0,
|
|
i * sizeof(digit));
|
|
|
|
/* 3. t2 <- al*bl, and copy into the low digits. */
|
|
if ((t2 = k_mul(al, bl)) == NULL) {
|
|
Py_DECREF(t1);
|
|
goto fail;
|
|
}
|
|
assert(t2->ob_size >= 0);
|
|
assert(t2->ob_size <= 2*shift); /* no overlap with high digits */
|
|
memcpy(ret->ob_digit, t2->ob_digit, t2->ob_size * sizeof(digit));
|
|
|
|
/* Zero out remaining digits. */
|
|
i = 2*shift - t2->ob_size; /* number of uninitialized digits */
|
|
if (i)
|
|
memset(ret->ob_digit + t2->ob_size, 0, i * sizeof(digit));
|
|
|
|
/* 4 & 5. Subtract ah*bh (t1) and al*bl (t2). We do al*bl first
|
|
* because it's fresher in cache.
|
|
*/
|
|
i = ret->ob_size - shift; /* # digits after shift */
|
|
(void)v_isub(ret->ob_digit + shift, i, t2->ob_digit, t2->ob_size);
|
|
Py_DECREF(t2);
|
|
|
|
(void)v_isub(ret->ob_digit + shift, i, t1->ob_digit, t1->ob_size);
|
|
Py_DECREF(t1);
|
|
|
|
/* 6. t3 <- (ah+al)(bh+bl), and add into result. */
|
|
if ((t1 = x_add(ah, al)) == NULL) goto fail;
|
|
Py_DECREF(ah);
|
|
Py_DECREF(al);
|
|
ah = al = NULL;
|
|
|
|
if (a == b) {
|
|
t2 = t1;
|
|
Py_INCREF(t2);
|
|
}
|
|
else if ((t2 = x_add(bh, bl)) == NULL) {
|
|
Py_DECREF(t1);
|
|
goto fail;
|
|
}
|
|
Py_DECREF(bh);
|
|
Py_DECREF(bl);
|
|
bh = bl = NULL;
|
|
|
|
t3 = k_mul(t1, t2);
|
|
Py_DECREF(t1);
|
|
Py_DECREF(t2);
|
|
if (t3 == NULL) goto fail;
|
|
assert(t3->ob_size >= 0);
|
|
|
|
/* Add t3. It's not obvious why we can't run out of room here.
|
|
* See the (*) comment after this function.
|
|
*/
|
|
(void)v_iadd(ret->ob_digit + shift, i, t3->ob_digit, t3->ob_size);
|
|
Py_DECREF(t3);
|
|
|
|
return long_normalize(ret);
|
|
|
|
fail:
|
|
Py_XDECREF(ret);
|
|
Py_XDECREF(ah);
|
|
Py_XDECREF(al);
|
|
Py_XDECREF(bh);
|
|
Py_XDECREF(bl);
|
|
return NULL;
|
|
}
|
|
|
|
/* (*) Why adding t3 can't "run out of room" above.
|
|
|
|
Let f(x) mean the floor of x and c(x) mean the ceiling of x. Some facts
|
|
to start with:
|
|
|
|
1. For any integer i, i = c(i/2) + f(i/2). In particular,
|
|
bsize = c(bsize/2) + f(bsize/2).
|
|
2. shift = f(bsize/2)
|
|
3. asize <= bsize
|
|
4. Since we call k_lopsided_mul if asize*2 <= bsize, asize*2 > bsize in this
|
|
routine, so asize > bsize/2 >= f(bsize/2) in this routine.
|
|
|
|
We allocated asize + bsize result digits, and add t3 into them at an offset
|
|
of shift. This leaves asize+bsize-shift allocated digit positions for t3
|
|
to fit into, = (by #1 and #2) asize + f(bsize/2) + c(bsize/2) - f(bsize/2) =
|
|
asize + c(bsize/2) available digit positions.
|
|
|
|
bh has c(bsize/2) digits, and bl at most f(size/2) digits. So bh+hl has
|
|
at most c(bsize/2) digits + 1 bit.
|
|
|
|
If asize == bsize, ah has c(bsize/2) digits, else ah has at most f(bsize/2)
|
|
digits, and al has at most f(bsize/2) digits in any case. So ah+al has at
|
|
most (asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 1 bit.
|
|
|
|
The product (ah+al)*(bh+bl) therefore has at most
|
|
|
|
c(bsize/2) + (asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 2 bits
|
|
|
|
and we have asize + c(bsize/2) available digit positions. We need to show
|
|
this is always enough. An instance of c(bsize/2) cancels out in both, so
|
|
the question reduces to whether asize digits is enough to hold
|
|
(asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 2 bits. If asize < bsize,
|
|
then we're asking whether asize digits >= f(bsize/2) digits + 2 bits. By #4,
|
|
asize is at least f(bsize/2)+1 digits, so this in turn reduces to whether 1
|
|
digit is enough to hold 2 bits. This is so since SHIFT=15 >= 2. If
|
|
asize == bsize, then we're asking whether bsize digits is enough to hold
|
|
c(bsize/2) digits + 2 bits, or equivalently (by #1) whether f(bsize/2) digits
|
|
is enough to hold 2 bits. This is so if bsize >= 2, which holds because
|
|
bsize >= KARATSUBA_CUTOFF >= 2.
|
|
|
|
Note that since there's always enough room for (ah+al)*(bh+bl), and that's
|
|
clearly >= each of ah*bh and al*bl, there's always enough room to subtract
|
|
ah*bh and al*bl too.
|
|
*/
|
|
|
|
/* b has at least twice the digits of a, and a is big enough that Karatsuba
|
|
* would pay off *if* the inputs had balanced sizes. View b as a sequence
|
|
* of slices, each with a->ob_size digits, and multiply the slices by a,
|
|
* one at a time. This gives k_mul balanced inputs to work with, and is
|
|
* also cache-friendly (we compute one double-width slice of the result
|
|
* at a time, then move on, never bactracking except for the helpful
|
|
* single-width slice overlap between successive partial sums).
|
|
*/
|
|
static PyLongObject *
|
|
k_lopsided_mul(PyLongObject *a, PyLongObject *b)
|
|
{
|
|
const Py_ssize_t asize = ABS(a->ob_size);
|
|
Py_ssize_t bsize = ABS(b->ob_size);
|
|
Py_ssize_t nbdone; /* # of b digits already multiplied */
|
|
PyLongObject *ret;
|
|
PyLongObject *bslice = NULL;
|
|
|
|
assert(asize > KARATSUBA_CUTOFF);
|
|
assert(2 * asize <= bsize);
|
|
|
|
/* Allocate result space, and zero it out. */
|
|
ret = _PyLong_New(asize + bsize);
|
|
if (ret == NULL)
|
|
return NULL;
|
|
memset(ret->ob_digit, 0, ret->ob_size * sizeof(digit));
|
|
|
|
/* Successive slices of b are copied into bslice. */
|
|
bslice = _PyLong_New(asize);
|
|
if (bslice == NULL)
|
|
goto fail;
|
|
|
|
nbdone = 0;
|
|
while (bsize > 0) {
|
|
PyLongObject *product;
|
|
const Py_ssize_t nbtouse = MIN(bsize, asize);
|
|
|
|
/* Multiply the next slice of b by a. */
|
|
memcpy(bslice->ob_digit, b->ob_digit + nbdone,
|
|
nbtouse * sizeof(digit));
|
|
bslice->ob_size = nbtouse;
|
|
product = k_mul(a, bslice);
|
|
if (product == NULL)
|
|
goto fail;
|
|
|
|
/* Add into result. */
|
|
(void)v_iadd(ret->ob_digit + nbdone, ret->ob_size - nbdone,
|
|
product->ob_digit, product->ob_size);
|
|
Py_DECREF(product);
|
|
|
|
bsize -= nbtouse;
|
|
nbdone += nbtouse;
|
|
}
|
|
|
|
Py_DECREF(bslice);
|
|
return long_normalize(ret);
|
|
|
|
fail:
|
|
Py_DECREF(ret);
|
|
Py_XDECREF(bslice);
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
long_mul(PyLongObject *v, PyLongObject *w)
|
|
{
|
|
PyLongObject *a, *b, *z;
|
|
|
|
if (!convert_binop((PyObject *)v, (PyObject *)w, &a, &b)) {
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
if (ABS(v->ob_size) <= 1 && ABS(w->ob_size) <= 1) {
|
|
PyObject *r;
|
|
r = PyLong_FromLong(MEDIUM_VALUE(v)*MEDIUM_VALUE(w));
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return r;
|
|
}
|
|
|
|
z = k_mul(a, b);
|
|
/* Negate if exactly one of the inputs is negative. */
|
|
if (((a->ob_size ^ b->ob_size) < 0) && z)
|
|
NEGATE(z);
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)z;
|
|
}
|
|
|
|
/* The / and % operators are now defined in terms of divmod().
|
|
The expression a mod b has the value a - b*floor(a/b).
|
|
The long_divrem function gives the remainder after division of
|
|
|a| by |b|, with the sign of a. This is also expressed
|
|
as a - b*trunc(a/b), if trunc truncates towards zero.
|
|
Some examples:
|
|
a b a rem b a mod b
|
|
13 10 3 3
|
|
-13 10 -3 7
|
|
13 -10 3 -7
|
|
-13 -10 -3 -3
|
|
So, to get from rem to mod, we have to add b if a and b
|
|
have different signs. We then subtract one from the 'div'
|
|
part of the outcome to keep the invariant intact. */
|
|
|
|
/* Compute
|
|
* *pdiv, *pmod = divmod(v, w)
|
|
* NULL can be passed for pdiv or pmod, in which case that part of
|
|
* the result is simply thrown away. The caller owns a reference to
|
|
* each of these it requests (does not pass NULL for).
|
|
*/
|
|
static int
|
|
l_divmod(PyLongObject *v, PyLongObject *w,
|
|
PyLongObject **pdiv, PyLongObject **pmod)
|
|
{
|
|
PyLongObject *div, *mod;
|
|
|
|
if (long_divrem(v, w, &div, &mod) < 0)
|
|
return -1;
|
|
if ((mod->ob_size < 0 && w->ob_size > 0) ||
|
|
(mod->ob_size > 0 && w->ob_size < 0)) {
|
|
PyLongObject *temp;
|
|
PyLongObject *one;
|
|
temp = (PyLongObject *) long_add(mod, w);
|
|
Py_DECREF(mod);
|
|
mod = temp;
|
|
if (mod == NULL) {
|
|
Py_DECREF(div);
|
|
return -1;
|
|
}
|
|
one = (PyLongObject *) PyLong_FromLong(1L);
|
|
if (one == NULL ||
|
|
(temp = (PyLongObject *) long_sub(div, one)) == NULL) {
|
|
Py_DECREF(mod);
|
|
Py_DECREF(div);
|
|
Py_XDECREF(one);
|
|
return -1;
|
|
}
|
|
Py_DECREF(one);
|
|
Py_DECREF(div);
|
|
div = temp;
|
|
}
|
|
if (pdiv != NULL)
|
|
*pdiv = div;
|
|
else
|
|
Py_DECREF(div);
|
|
|
|
if (pmod != NULL)
|
|
*pmod = mod;
|
|
else
|
|
Py_DECREF(mod);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
long_div(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b, *div;
|
|
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
if (l_divmod(a, b, &div, NULL) < 0)
|
|
div = NULL;
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)div;
|
|
}
|
|
|
|
static PyObject *
|
|
long_true_divide(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b;
|
|
double ad, bd;
|
|
int failed, aexp = -1, bexp = -1;
|
|
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
ad = _PyLong_AsScaledDouble((PyObject *)a, &aexp);
|
|
bd = _PyLong_AsScaledDouble((PyObject *)b, &bexp);
|
|
failed = (ad == -1.0 || bd == -1.0) && PyErr_Occurred();
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
if (failed)
|
|
return NULL;
|
|
/* 'aexp' and 'bexp' were initialized to -1 to silence gcc-4.0.x,
|
|
but should really be set correctly after sucessful calls to
|
|
_PyLong_AsScaledDouble() */
|
|
assert(aexp >= 0 && bexp >= 0);
|
|
|
|
if (bd == 0.0) {
|
|
PyErr_SetString(PyExc_ZeroDivisionError,
|
|
"int division or modulo by zero");
|
|
return NULL;
|
|
}
|
|
|
|
/* True value is very close to ad/bd * 2**(SHIFT*(aexp-bexp)) */
|
|
ad /= bd; /* overflow/underflow impossible here */
|
|
aexp -= bexp;
|
|
if (aexp > INT_MAX / SHIFT)
|
|
goto overflow;
|
|
else if (aexp < -(INT_MAX / SHIFT))
|
|
return PyFloat_FromDouble(0.0); /* underflow to 0 */
|
|
errno = 0;
|
|
ad = ldexp(ad, aexp * SHIFT);
|
|
if (Py_OVERFLOWED(ad)) /* ignore underflow to 0.0 */
|
|
goto overflow;
|
|
return PyFloat_FromDouble(ad);
|
|
|
|
overflow:
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"int/int too large for a float");
|
|
return NULL;
|
|
|
|
}
|
|
|
|
static PyObject *
|
|
long_mod(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b, *mod;
|
|
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
|
|
if (l_divmod(a, b, NULL, &mod) < 0)
|
|
mod = NULL;
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)mod;
|
|
}
|
|
|
|
static PyObject *
|
|
long_divmod(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b, *div, *mod;
|
|
PyObject *z;
|
|
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
|
|
if (l_divmod(a, b, &div, &mod) < 0) {
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return NULL;
|
|
}
|
|
z = PyTuple_New(2);
|
|
if (z != NULL) {
|
|
PyTuple_SetItem(z, 0, (PyObject *) div);
|
|
PyTuple_SetItem(z, 1, (PyObject *) mod);
|
|
}
|
|
else {
|
|
Py_DECREF(div);
|
|
Py_DECREF(mod);
|
|
}
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return z;
|
|
}
|
|
|
|
/* pow(v, w, x) */
|
|
static PyObject *
|
|
long_pow(PyObject *v, PyObject *w, PyObject *x)
|
|
{
|
|
PyLongObject *a, *b, *c; /* a,b,c = v,w,x */
|
|
int negativeOutput = 0; /* if x<0 return negative output */
|
|
|
|
PyLongObject *z = NULL; /* accumulated result */
|
|
Py_ssize_t i, j, k; /* counters */
|
|
PyLongObject *temp = NULL;
|
|
|
|
/* 5-ary values. If the exponent is large enough, table is
|
|
* precomputed so that table[i] == a**i % c for i in range(32).
|
|
*/
|
|
PyLongObject *table[32] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
|
|
|
|
/* a, b, c = v, w, x */
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
if (PyLong_Check(x)) {
|
|
c = (PyLongObject *)x;
|
|
Py_INCREF(x);
|
|
}
|
|
else if (x == Py_None)
|
|
c = NULL;
|
|
else {
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
if (b->ob_size < 0) { /* if exponent is negative */
|
|
if (c) {
|
|
PyErr_SetString(PyExc_TypeError, "pow() 2nd argument "
|
|
"cannot be negative when 3rd argument specified");
|
|
goto Error;
|
|
}
|
|
else {
|
|
/* else return a float. This works because we know
|
|
that this calls float_pow() which converts its
|
|
arguments to double. */
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return PyFloat_Type.tp_as_number->nb_power(v, w, x);
|
|
}
|
|
}
|
|
|
|
if (c) {
|
|
/* if modulus == 0:
|
|
raise ValueError() */
|
|
if (c->ob_size == 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"pow() 3rd argument cannot be 0");
|
|
goto Error;
|
|
}
|
|
|
|
/* if modulus < 0:
|
|
negativeOutput = True
|
|
modulus = -modulus */
|
|
if (c->ob_size < 0) {
|
|
negativeOutput = 1;
|
|
temp = (PyLongObject *)_PyLong_Copy(c);
|
|
if (temp == NULL)
|
|
goto Error;
|
|
Py_DECREF(c);
|
|
c = temp;
|
|
temp = NULL;
|
|
NEGATE(c);
|
|
}
|
|
|
|
/* if modulus == 1:
|
|
return 0 */
|
|
if ((c->ob_size == 1) && (c->ob_digit[0] == 1)) {
|
|
z = (PyLongObject *)PyLong_FromLong(0L);
|
|
goto Done;
|
|
}
|
|
|
|
/* if base < 0:
|
|
base = base % modulus
|
|
Having the base positive just makes things easier. */
|
|
if (a->ob_size < 0) {
|
|
if (l_divmod(a, c, NULL, &temp) < 0)
|
|
goto Error;
|
|
Py_DECREF(a);
|
|
a = temp;
|
|
temp = NULL;
|
|
}
|
|
}
|
|
|
|
/* At this point a, b, and c are guaranteed non-negative UNLESS
|
|
c is NULL, in which case a may be negative. */
|
|
|
|
z = (PyLongObject *)PyLong_FromLong(1L);
|
|
if (z == NULL)
|
|
goto Error;
|
|
|
|
/* Perform a modular reduction, X = X % c, but leave X alone if c
|
|
* is NULL.
|
|
*/
|
|
#define REDUCE(X) \
|
|
if (c != NULL) { \
|
|
if (l_divmod(X, c, NULL, &temp) < 0) \
|
|
goto Error; \
|
|
Py_XDECREF(X); \
|
|
X = temp; \
|
|
temp = NULL; \
|
|
}
|
|
|
|
/* Multiply two values, then reduce the result:
|
|
result = X*Y % c. If c is NULL, skip the mod. */
|
|
#define MULT(X, Y, result) \
|
|
{ \
|
|
temp = (PyLongObject *)long_mul(X, Y); \
|
|
if (temp == NULL) \
|
|
goto Error; \
|
|
Py_XDECREF(result); \
|
|
result = temp; \
|
|
temp = NULL; \
|
|
REDUCE(result) \
|
|
}
|
|
|
|
if (b->ob_size <= FIVEARY_CUTOFF) {
|
|
/* Left-to-right binary exponentiation (HAC Algorithm 14.79) */
|
|
/* http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf */
|
|
for (i = b->ob_size - 1; i >= 0; --i) {
|
|
digit bi = b->ob_digit[i];
|
|
|
|
for (j = 1 << (SHIFT-1); j != 0; j >>= 1) {
|
|
MULT(z, z, z)
|
|
if (bi & j)
|
|
MULT(z, a, z)
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
/* Left-to-right 5-ary exponentiation (HAC Algorithm 14.82) */
|
|
Py_INCREF(z); /* still holds 1L */
|
|
table[0] = z;
|
|
for (i = 1; i < 32; ++i)
|
|
MULT(table[i-1], a, table[i])
|
|
|
|
for (i = b->ob_size - 1; i >= 0; --i) {
|
|
const digit bi = b->ob_digit[i];
|
|
|
|
for (j = SHIFT - 5; j >= 0; j -= 5) {
|
|
const int index = (bi >> j) & 0x1f;
|
|
for (k = 0; k < 5; ++k)
|
|
MULT(z, z, z)
|
|
if (index)
|
|
MULT(z, table[index], z)
|
|
}
|
|
}
|
|
}
|
|
|
|
if (negativeOutput && (z->ob_size != 0)) {
|
|
temp = (PyLongObject *)long_sub(z, c);
|
|
if (temp == NULL)
|
|
goto Error;
|
|
Py_DECREF(z);
|
|
z = temp;
|
|
temp = NULL;
|
|
}
|
|
goto Done;
|
|
|
|
Error:
|
|
if (z != NULL) {
|
|
Py_DECREF(z);
|
|
z = NULL;
|
|
}
|
|
/* fall through */
|
|
Done:
|
|
if (b->ob_size > FIVEARY_CUTOFF) {
|
|
for (i = 0; i < 32; ++i)
|
|
Py_XDECREF(table[i]);
|
|
}
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
Py_XDECREF(c);
|
|
Py_XDECREF(temp);
|
|
return (PyObject *)z;
|
|
}
|
|
|
|
static PyObject *
|
|
long_invert(PyLongObject *v)
|
|
{
|
|
/* Implement ~x as -(x+1) */
|
|
PyLongObject *x;
|
|
PyLongObject *w;
|
|
if (ABS(v->ob_size) <=1)
|
|
return PyLong_FromLong(-(MEDIUM_VALUE(v)+1));
|
|
w = (PyLongObject *)PyLong_FromLong(1L);
|
|
if (w == NULL)
|
|
return NULL;
|
|
x = (PyLongObject *) long_add(v, w);
|
|
Py_DECREF(w);
|
|
if (x == NULL)
|
|
return NULL;
|
|
x->ob_size = -(x->ob_size);
|
|
return (PyObject *)x;
|
|
}
|
|
|
|
static PyObject *
|
|
long_pos(PyLongObject *v)
|
|
{
|
|
if (PyLong_CheckExact(v)) {
|
|
Py_INCREF(v);
|
|
return (PyObject *)v;
|
|
}
|
|
else
|
|
return _PyLong_Copy(v);
|
|
}
|
|
|
|
static PyObject *
|
|
long_neg(PyLongObject *v)
|
|
{
|
|
PyLongObject *z;
|
|
if (ABS(v->ob_size) <= 1)
|
|
return PyLong_FromLong(-MEDIUM_VALUE(v));
|
|
z = (PyLongObject *)_PyLong_Copy(v);
|
|
if (z != NULL)
|
|
z->ob_size = -(v->ob_size);
|
|
return (PyObject *)z;
|
|
}
|
|
|
|
static PyObject *
|
|
long_abs(PyLongObject *v)
|
|
{
|
|
if (v->ob_size < 0)
|
|
return long_neg(v);
|
|
else
|
|
return long_pos(v);
|
|
}
|
|
|
|
static int
|
|
long_bool(PyLongObject *v)
|
|
{
|
|
return ABS(v->ob_size) != 0;
|
|
}
|
|
|
|
static PyObject *
|
|
long_rshift(PyLongObject *v, PyLongObject *w)
|
|
{
|
|
PyLongObject *a, *b;
|
|
PyLongObject *z = NULL;
|
|
long shiftby;
|
|
Py_ssize_t newsize, wordshift, loshift, hishift, i, j;
|
|
digit lomask, himask;
|
|
|
|
CONVERT_BINOP((PyObject *)v, (PyObject *)w, &a, &b);
|
|
|
|
if (a->ob_size < 0) {
|
|
/* Right shifting negative numbers is harder */
|
|
PyLongObject *a1, *a2;
|
|
a1 = (PyLongObject *) long_invert(a);
|
|
if (a1 == NULL)
|
|
goto rshift_error;
|
|
a2 = (PyLongObject *) long_rshift(a1, b);
|
|
Py_DECREF(a1);
|
|
if (a2 == NULL)
|
|
goto rshift_error;
|
|
z = (PyLongObject *) long_invert(a2);
|
|
Py_DECREF(a2);
|
|
}
|
|
else {
|
|
|
|
shiftby = PyLong_AsLong((PyObject *)b);
|
|
if (shiftby == -1L && PyErr_Occurred())
|
|
goto rshift_error;
|
|
if (shiftby < 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"negative shift count");
|
|
goto rshift_error;
|
|
}
|
|
wordshift = shiftby / SHIFT;
|
|
newsize = ABS(a->ob_size) - wordshift;
|
|
if (newsize <= 0) {
|
|
z = _PyLong_New(0);
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *)z;
|
|
}
|
|
loshift = shiftby % SHIFT;
|
|
hishift = SHIFT - loshift;
|
|
lomask = ((digit)1 << hishift) - 1;
|
|
himask = MASK ^ lomask;
|
|
z = _PyLong_New(newsize);
|
|
if (z == NULL)
|
|
goto rshift_error;
|
|
if (a->ob_size < 0)
|
|
z->ob_size = -(z->ob_size);
|
|
for (i = 0, j = wordshift; i < newsize; i++, j++) {
|
|
z->ob_digit[i] = (a->ob_digit[j] >> loshift) & lomask;
|
|
if (i+1 < newsize)
|
|
z->ob_digit[i] |=
|
|
(a->ob_digit[j+1] << hishift) & himask;
|
|
}
|
|
z = long_normalize(z);
|
|
}
|
|
rshift_error:
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *) z;
|
|
|
|
}
|
|
|
|
static PyObject *
|
|
long_lshift(PyObject *v, PyObject *w)
|
|
{
|
|
/* This version due to Tim Peters */
|
|
PyLongObject *a, *b;
|
|
PyLongObject *z = NULL;
|
|
long shiftby;
|
|
Py_ssize_t oldsize, newsize, wordshift, remshift, i, j;
|
|
twodigits accum;
|
|
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
|
|
shiftby = PyLong_AsLong((PyObject *)b);
|
|
if (shiftby == -1L && PyErr_Occurred())
|
|
goto lshift_error;
|
|
if (shiftby < 0) {
|
|
PyErr_SetString(PyExc_ValueError, "negative shift count");
|
|
goto lshift_error;
|
|
}
|
|
if ((long)(int)shiftby != shiftby) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"outrageous left shift count");
|
|
goto lshift_error;
|
|
}
|
|
/* wordshift, remshift = divmod(shiftby, SHIFT) */
|
|
wordshift = (int)shiftby / SHIFT;
|
|
remshift = (int)shiftby - wordshift * SHIFT;
|
|
|
|
oldsize = ABS(a->ob_size);
|
|
newsize = oldsize + wordshift;
|
|
if (remshift)
|
|
++newsize;
|
|
z = _PyLong_New(newsize);
|
|
if (z == NULL)
|
|
goto lshift_error;
|
|
if (a->ob_size < 0)
|
|
NEGATE(z);
|
|
for (i = 0; i < wordshift; i++)
|
|
z->ob_digit[i] = 0;
|
|
accum = 0;
|
|
for (i = wordshift, j = 0; j < oldsize; i++, j++) {
|
|
accum |= (twodigits)a->ob_digit[j] << remshift;
|
|
z->ob_digit[i] = (digit)(accum & MASK);
|
|
accum >>= SHIFT;
|
|
}
|
|
if (remshift)
|
|
z->ob_digit[newsize-1] = (digit)accum;
|
|
else
|
|
assert(!accum);
|
|
z = long_normalize(z);
|
|
lshift_error:
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return (PyObject *) z;
|
|
}
|
|
|
|
|
|
/* Bitwise and/xor/or operations */
|
|
|
|
static PyObject *
|
|
long_bitwise(PyLongObject *a,
|
|
int op, /* '&', '|', '^' */
|
|
PyLongObject *b)
|
|
{
|
|
digit maska, maskb; /* 0 or MASK */
|
|
int negz;
|
|
Py_ssize_t size_a, size_b, size_z;
|
|
PyLongObject *z;
|
|
int i;
|
|
digit diga, digb;
|
|
PyObject *v;
|
|
|
|
if (a->ob_size < 0) {
|
|
a = (PyLongObject *) long_invert(a);
|
|
if (a == NULL)
|
|
return NULL;
|
|
maska = MASK;
|
|
}
|
|
else {
|
|
Py_INCREF(a);
|
|
maska = 0;
|
|
}
|
|
if (b->ob_size < 0) {
|
|
b = (PyLongObject *) long_invert(b);
|
|
if (b == NULL) {
|
|
Py_DECREF(a);
|
|
return NULL;
|
|
}
|
|
maskb = MASK;
|
|
}
|
|
else {
|
|
Py_INCREF(b);
|
|
maskb = 0;
|
|
}
|
|
|
|
negz = 0;
|
|
switch (op) {
|
|
case '^':
|
|
if (maska != maskb) {
|
|
maska ^= MASK;
|
|
negz = -1;
|
|
}
|
|
break;
|
|
case '&':
|
|
if (maska && maskb) {
|
|
op = '|';
|
|
maska ^= MASK;
|
|
maskb ^= MASK;
|
|
negz = -1;
|
|
}
|
|
break;
|
|
case '|':
|
|
if (maska || maskb) {
|
|
op = '&';
|
|
maska ^= MASK;
|
|
maskb ^= MASK;
|
|
negz = -1;
|
|
}
|
|
break;
|
|
}
|
|
|
|
/* JRH: The original logic here was to allocate the result value (z)
|
|
as the longer of the two operands. However, there are some cases
|
|
where the result is guaranteed to be shorter than that: AND of two
|
|
positives, OR of two negatives: use the shorter number. AND with
|
|
mixed signs: use the positive number. OR with mixed signs: use the
|
|
negative number. After the transformations above, op will be '&'
|
|
iff one of these cases applies, and mask will be non-0 for operands
|
|
whose length should be ignored.
|
|
*/
|
|
|
|
size_a = a->ob_size;
|
|
size_b = b->ob_size;
|
|
size_z = op == '&'
|
|
? (maska
|
|
? size_b
|
|
: (maskb ? size_a : MIN(size_a, size_b)))
|
|
: MAX(size_a, size_b);
|
|
z = _PyLong_New(size_z);
|
|
if (z == NULL) {
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return NULL;
|
|
}
|
|
|
|
for (i = 0; i < size_z; ++i) {
|
|
diga = (i < size_a ? a->ob_digit[i] : 0) ^ maska;
|
|
digb = (i < size_b ? b->ob_digit[i] : 0) ^ maskb;
|
|
switch (op) {
|
|
case '&': z->ob_digit[i] = diga & digb; break;
|
|
case '|': z->ob_digit[i] = diga | digb; break;
|
|
case '^': z->ob_digit[i] = diga ^ digb; break;
|
|
}
|
|
}
|
|
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
z = long_normalize(z);
|
|
if (negz == 0)
|
|
return (PyObject *) z;
|
|
v = long_invert(z);
|
|
Py_DECREF(z);
|
|
return v;
|
|
}
|
|
|
|
static PyObject *
|
|
long_and(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b;
|
|
PyObject *c;
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
c = long_bitwise(a, '&', b);
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return c;
|
|
}
|
|
|
|
static PyObject *
|
|
long_xor(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b;
|
|
PyObject *c;
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
c = long_bitwise(a, '^', b);
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return c;
|
|
}
|
|
|
|
static PyObject *
|
|
long_or(PyObject *v, PyObject *w)
|
|
{
|
|
PyLongObject *a, *b;
|
|
PyObject *c;
|
|
CONVERT_BINOP(v, w, &a, &b);
|
|
c = long_bitwise(a, '|', b);
|
|
Py_DECREF(a);
|
|
Py_DECREF(b);
|
|
return c;
|
|
}
|
|
|
|
static PyObject *
|
|
long_long(PyObject *v)
|
|
{
|
|
if (PyLong_CheckExact(v))
|
|
Py_INCREF(v);
|
|
else
|
|
v = _PyLong_Copy((PyLongObject *)v);
|
|
return v;
|
|
}
|
|
|
|
static PyObject *
|
|
long_int(PyObject *v)
|
|
{
|
|
return long_long(v);
|
|
}
|
|
|
|
static PyObject *
|
|
long_float(PyObject *v)
|
|
{
|
|
double result;
|
|
result = PyLong_AsDouble(v);
|
|
if (result == -1.0 && PyErr_Occurred())
|
|
return NULL;
|
|
return PyFloat_FromDouble(result);
|
|
}
|
|
|
|
static PyObject *
|
|
long_oct(PyObject *v)
|
|
{
|
|
return long_format(v, 8);
|
|
}
|
|
|
|
static PyObject *
|
|
long_hex(PyObject *v)
|
|
{
|
|
return long_format(v, 16);
|
|
}
|
|
|
|
static PyObject *
|
|
long_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
|
|
|
|
static PyObject *
|
|
long_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *x = NULL;
|
|
int base = -909; /* unlikely! */
|
|
static char *kwlist[] = {"x", "base", 0};
|
|
|
|
if (type != &PyLong_Type)
|
|
return long_subtype_new(type, args, kwds); /* Wimp out */
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oi:int", kwlist,
|
|
&x, &base))
|
|
return NULL;
|
|
if (x == NULL)
|
|
return PyLong_FromLong(0L);
|
|
if (base == -909)
|
|
return PyNumber_Long(x);
|
|
else if (PyString_Check(x)) {
|
|
/* Since PyLong_FromString doesn't have a length parameter,
|
|
* check here for possible NULs in the string. */
|
|
char *string = PyString_AS_STRING(x);
|
|
if (strlen(string) != PyString_Size(x)) {
|
|
/* create a repr() of the input string,
|
|
* just like PyLong_FromString does. */
|
|
PyObject *srepr;
|
|
srepr = PyObject_Repr(x);
|
|
if (srepr == NULL)
|
|
return NULL;
|
|
PyErr_Format(PyExc_ValueError,
|
|
"invalid literal for int() with base %d: %s",
|
|
base, PyString_AS_STRING(srepr));
|
|
Py_DECREF(srepr);
|
|
return NULL;
|
|
}
|
|
return PyLong_FromString(PyString_AS_STRING(x), NULL, base);
|
|
}
|
|
#ifdef Py_USING_UNICODE
|
|
else if (PyUnicode_Check(x))
|
|
return PyLong_FromUnicode(PyUnicode_AS_UNICODE(x),
|
|
PyUnicode_GET_SIZE(x),
|
|
base);
|
|
#endif
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"int() can't convert non-string with explicit base");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/* Wimpy, slow approach to tp_new calls for subtypes of long:
|
|
first create a regular long from whatever arguments we got,
|
|
then allocate a subtype instance and initialize it from
|
|
the regular long. The regular long is then thrown away.
|
|
*/
|
|
static PyObject *
|
|
long_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyLongObject *tmp, *newobj;
|
|
Py_ssize_t i, n;
|
|
|
|
assert(PyType_IsSubtype(type, &PyLong_Type));
|
|
tmp = (PyLongObject *)long_new(&PyLong_Type, args, kwds);
|
|
if (tmp == NULL)
|
|
return NULL;
|
|
assert(PyLong_CheckExact(tmp));
|
|
n = tmp->ob_size;
|
|
if (n < 0)
|
|
n = -n;
|
|
newobj = (PyLongObject *)type->tp_alloc(type, n);
|
|
if (newobj == NULL) {
|
|
Py_DECREF(tmp);
|
|
return NULL;
|
|
}
|
|
assert(PyLong_Check(newobj));
|
|
newobj->ob_size = tmp->ob_size;
|
|
for (i = 0; i < n; i++)
|
|
newobj->ob_digit[i] = tmp->ob_digit[i];
|
|
Py_DECREF(tmp);
|
|
return (PyObject *)newobj;
|
|
}
|
|
|
|
static PyObject *
|
|
long_getnewargs(PyLongObject *v)
|
|
{
|
|
return Py_BuildValue("(N)", _PyLong_Copy(v));
|
|
}
|
|
|
|
static PyMethodDef long_methods[] = {
|
|
{"__getnewargs__", (PyCFunction)long_getnewargs, METH_NOARGS},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
PyDoc_STRVAR(long_doc,
|
|
"int(x[, base]) -> integer\n\
|
|
\n\
|
|
Convert a string or number to an integer, if possible. A floating\n\
|
|
point argument will be truncated towards zero (this does not include a\n\
|
|
string representation of a floating point number!) When converting a\n\
|
|
string, use the optional base. It is an error to supply a base when\n\
|
|
converting a non-string.");
|
|
|
|
static PyNumberMethods long_as_number = {
|
|
(binaryfunc) long_add, /*nb_add*/
|
|
(binaryfunc) long_sub, /*nb_subtract*/
|
|
(binaryfunc) long_mul, /*nb_multiply*/
|
|
long_mod, /*nb_remainder*/
|
|
long_divmod, /*nb_divmod*/
|
|
long_pow, /*nb_power*/
|
|
(unaryfunc) long_neg, /*nb_negative*/
|
|
(unaryfunc) long_pos, /*tp_positive*/
|
|
(unaryfunc) long_abs, /*tp_absolute*/
|
|
(inquiry) long_bool, /*tp_bool*/
|
|
(unaryfunc) long_invert, /*nb_invert*/
|
|
long_lshift, /*nb_lshift*/
|
|
(binaryfunc) long_rshift, /*nb_rshift*/
|
|
long_and, /*nb_and*/
|
|
long_xor, /*nb_xor*/
|
|
long_or, /*nb_or*/
|
|
0, /*nb_coerce*/
|
|
long_int, /*nb_int*/
|
|
long_long, /*nb_long*/
|
|
long_float, /*nb_float*/
|
|
long_oct, /*nb_oct*/
|
|
long_hex, /*nb_hex*/
|
|
0, /* nb_inplace_add */
|
|
0, /* nb_inplace_subtract */
|
|
0, /* nb_inplace_multiply */
|
|
0, /* nb_inplace_remainder */
|
|
0, /* nb_inplace_power */
|
|
0, /* nb_inplace_lshift */
|
|
0, /* nb_inplace_rshift */
|
|
0, /* nb_inplace_and */
|
|
0, /* nb_inplace_xor */
|
|
0, /* nb_inplace_or */
|
|
long_div, /* nb_floor_divide */
|
|
long_true_divide, /* nb_true_divide */
|
|
0, /* nb_inplace_floor_divide */
|
|
0, /* nb_inplace_true_divide */
|
|
long_long, /* nb_index */
|
|
};
|
|
|
|
PyTypeObject PyLong_Type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0, /* ob_size */
|
|
"int", /* tp_name */
|
|
/* See _PyLong_New for why this isn't
|
|
sizeof(PyLongObject) - sizeof(digit) */
|
|
sizeof(PyVarObject), /* tp_basicsize */
|
|
sizeof(digit), /* tp_itemsize */
|
|
long_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
long_repr, /* tp_repr */
|
|
&long_as_number, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
(hashfunc)long_hash, /* tp_hash */
|
|
0, /* tp_call */
|
|
long_repr, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
|
|
Py_TPFLAGS_LONG_SUBCLASS, /* tp_flags */
|
|
long_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
long_richcompare, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
long_methods, /* tp_methods */
|
|
0, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
0, /* tp_alloc */
|
|
long_new, /* tp_new */
|
|
PyObject_Del, /* tp_free */
|
|
};
|
|
|
|
int
|
|
_PyLong_Init(void)
|
|
{
|
|
#if NSMALLNEGINTS + NSMALLPOSINTS > 0
|
|
int ival;
|
|
PyLongObject *v = small_ints;
|
|
for (ival = -NSMALLNEGINTS; ival < 0; ival++, v++) {
|
|
PyObject_INIT(v, &PyLong_Type);
|
|
v->ob_size = -1;
|
|
v->ob_digit[0] = -ival;
|
|
}
|
|
for (; ival < NSMALLPOSINTS; ival++, v++) {
|
|
PyObject_INIT(v, &PyLong_Type);
|
|
v->ob_size = ival ? 1 : 0;
|
|
v->ob_digit[0] = ival;
|
|
}
|
|
#endif
|
|
return 1;
|
|
}
|
|
|
|
void
|
|
PyLong_Fini(void)
|
|
{
|
|
#if 0
|
|
int i;
|
|
/* This is currently not needed; the small integers
|
|
are statically allocated */
|
|
#if NSMALLNEGINTS + NSMALLPOSINTS > 0
|
|
PyIntObject **q;
|
|
|
|
i = NSMALLNEGINTS + NSMALLPOSINTS;
|
|
q = small_ints;
|
|
while (--i >= 0) {
|
|
Py_XDECREF(*q);
|
|
*q++ = NULL;
|
|
}
|
|
#endif
|
|
#endif
|
|
}
|