mirror of
https://github.com/python/cpython.git
synced 2025-07-16 07:45:20 +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. ........
3170 lines
78 KiB
C
3170 lines
78 KiB
C
|
|
/* Module definition and import implementation */
|
|
|
|
#include "Python.h"
|
|
|
|
#include "Python-ast.h"
|
|
#undef Yield /* undefine macro conflicting with winbase.h */
|
|
#include "pyarena.h"
|
|
#include "pythonrun.h"
|
|
#include "errcode.h"
|
|
#include "marshal.h"
|
|
#include "code.h"
|
|
#include "compile.h"
|
|
#include "eval.h"
|
|
#include "osdefs.h"
|
|
#include "importdl.h"
|
|
|
|
#ifdef HAVE_FCNTL_H
|
|
#include <fcntl.h>
|
|
#endif
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
extern time_t PyOS_GetLastModificationTime(char *, FILE *);
|
|
/* In getmtime.c */
|
|
|
|
/* Magic word to reject .pyc files generated by other Python versions.
|
|
It should change for each incompatible change to the bytecode.
|
|
|
|
The value of CR and LF is incorporated so if you ever read or write
|
|
a .pyc file in text mode the magic number will be wrong; also, the
|
|
Apple MPW compiler swaps their values, botching string constants.
|
|
|
|
The magic numbers must be spaced apart at least 2 values, as the
|
|
-U interpeter flag will cause MAGIC+1 being used. They have been
|
|
odd numbers for some time now.
|
|
|
|
There were a variety of old schemes for setting the magic number.
|
|
The current working scheme is to increment the previous value by
|
|
10.
|
|
|
|
Known values:
|
|
Python 1.5: 20121
|
|
Python 1.5.1: 20121
|
|
Python 1.5.2: 20121
|
|
Python 1.6: 50428
|
|
Python 2.0: 50823
|
|
Python 2.0.1: 50823
|
|
Python 2.1: 60202
|
|
Python 2.1.1: 60202
|
|
Python 2.1.2: 60202
|
|
Python 2.2: 60717
|
|
Python 2.3a0: 62011
|
|
Python 2.3a0: 62021
|
|
Python 2.3a0: 62011 (!)
|
|
Python 2.4a0: 62041
|
|
Python 2.4a3: 62051
|
|
Python 2.4b1: 62061
|
|
Python 2.5a0: 62071
|
|
Python 2.5a0: 62081 (ast-branch)
|
|
Python 2.5a0: 62091 (with)
|
|
Python 2.5a0: 62092 (changed WITH_CLEANUP opcode)
|
|
Python 2.5b3: 62101 (fix wrong code: for x, in ...)
|
|
Python 2.5b3: 62111 (fix wrong code: x += yield)
|
|
Python 2.5c1: 62121 (fix wrong lnotab with for loops and
|
|
storing constants that should have been removed)
|
|
Python 2.5c2: 62131 (fix wrong code: for x, in ... in listcomp/genexp)
|
|
Python 2.6a0: 62141 (peephole optimizations)
|
|
Python 3000: 3000
|
|
3010 (removed UNARY_CONVERT)
|
|
3020 (added BUILD_SET)
|
|
3030 (added keyword-only parameters)
|
|
3040 (added signature annotations)
|
|
3050 (print becomes a function)
|
|
3060 (PEP 3115 metaclass syntax)
|
|
.
|
|
*/
|
|
#define MAGIC (3060 | ((long)'\r'<<16) | ((long)'\n'<<24))
|
|
|
|
/* Magic word as global; note that _PyImport_Init() can change the
|
|
value of this global to accommodate for alterations of how the
|
|
compiler works which are enabled by command line switches. */
|
|
static long pyc_magic = MAGIC;
|
|
|
|
/* See _PyImport_FixupExtension() below */
|
|
static PyObject *extensions = NULL;
|
|
|
|
/* This table is defined in config.c: */
|
|
extern struct _inittab _PyImport_Inittab[];
|
|
|
|
struct _inittab *PyImport_Inittab = _PyImport_Inittab;
|
|
|
|
/* these tables define the module suffixes that Python recognizes */
|
|
struct filedescr * _PyImport_Filetab = NULL;
|
|
|
|
#ifdef RISCOS
|
|
static const struct filedescr _PyImport_StandardFiletab[] = {
|
|
{"/py", "U", PY_SOURCE},
|
|
{"/pyc", "rb", PY_COMPILED},
|
|
{0, 0}
|
|
};
|
|
#else
|
|
static const struct filedescr _PyImport_StandardFiletab[] = {
|
|
{".py", "U", PY_SOURCE},
|
|
#ifdef MS_WINDOWS
|
|
{".pyw", "U", PY_SOURCE},
|
|
#endif
|
|
{".pyc", "rb", PY_COMPILED},
|
|
{0, 0}
|
|
};
|
|
#endif
|
|
|
|
static PyTypeObject NullImporterType; /* Forward reference */
|
|
|
|
/* Initialize things */
|
|
|
|
void
|
|
_PyImport_Init(void)
|
|
{
|
|
const struct filedescr *scan;
|
|
struct filedescr *filetab;
|
|
int countD = 0;
|
|
int countS = 0;
|
|
|
|
/* prepare _PyImport_Filetab: copy entries from
|
|
_PyImport_DynLoadFiletab and _PyImport_StandardFiletab.
|
|
*/
|
|
for (scan = _PyImport_DynLoadFiletab; scan->suffix != NULL; ++scan)
|
|
++countD;
|
|
for (scan = _PyImport_StandardFiletab; scan->suffix != NULL; ++scan)
|
|
++countS;
|
|
filetab = PyMem_NEW(struct filedescr, countD + countS + 1);
|
|
if (filetab == NULL)
|
|
Py_FatalError("Can't initialize import file table.");
|
|
memcpy(filetab, _PyImport_DynLoadFiletab,
|
|
countD * sizeof(struct filedescr));
|
|
memcpy(filetab + countD, _PyImport_StandardFiletab,
|
|
countS * sizeof(struct filedescr));
|
|
filetab[countD + countS].suffix = NULL;
|
|
|
|
_PyImport_Filetab = filetab;
|
|
|
|
if (Py_OptimizeFlag) {
|
|
/* Replace ".pyc" with ".pyo" in _PyImport_Filetab */
|
|
for (; filetab->suffix != NULL; filetab++) {
|
|
#ifndef RISCOS
|
|
if (strcmp(filetab->suffix, ".pyc") == 0)
|
|
filetab->suffix = ".pyo";
|
|
#else
|
|
if (strcmp(filetab->suffix, "/pyc") == 0)
|
|
filetab->suffix = "/pyo";
|
|
#endif
|
|
}
|
|
}
|
|
|
|
if (Py_UnicodeFlag) {
|
|
/* Fix the pyc_magic so that byte compiled code created
|
|
using the all-Unicode method doesn't interfere with
|
|
code created in normal operation mode. */
|
|
pyc_magic = MAGIC + 1;
|
|
}
|
|
}
|
|
|
|
void
|
|
_PyImportHooks_Init(void)
|
|
{
|
|
PyObject *v, *path_hooks = NULL, *zimpimport;
|
|
int err = 0;
|
|
|
|
/* adding sys.path_hooks and sys.path_importer_cache, setting up
|
|
zipimport */
|
|
if (PyType_Ready(&NullImporterType) < 0)
|
|
goto error;
|
|
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# installing zipimport hook\n");
|
|
|
|
v = PyList_New(0);
|
|
if (v == NULL)
|
|
goto error;
|
|
err = PySys_SetObject("meta_path", v);
|
|
Py_DECREF(v);
|
|
if (err)
|
|
goto error;
|
|
v = PyDict_New();
|
|
if (v == NULL)
|
|
goto error;
|
|
err = PySys_SetObject("path_importer_cache", v);
|
|
Py_DECREF(v);
|
|
if (err)
|
|
goto error;
|
|
path_hooks = PyList_New(0);
|
|
if (path_hooks == NULL)
|
|
goto error;
|
|
err = PySys_SetObject("path_hooks", path_hooks);
|
|
if (err) {
|
|
error:
|
|
PyErr_Print();
|
|
Py_FatalError("initializing sys.meta_path, sys.path_hooks, "
|
|
"path_importer_cache, or NullImporter failed"
|
|
);
|
|
}
|
|
|
|
zimpimport = PyImport_ImportModule("zipimport");
|
|
if (zimpimport == NULL) {
|
|
PyErr_Clear(); /* No zip import module -- okay */
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# can't import zipimport\n");
|
|
}
|
|
else {
|
|
PyObject *zipimporter = PyObject_GetAttrString(zimpimport,
|
|
"zipimporter");
|
|
Py_DECREF(zimpimport);
|
|
if (zipimporter == NULL) {
|
|
PyErr_Clear(); /* No zipimporter object -- okay */
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr(
|
|
"# can't import zipimport.zipimporter\n");
|
|
}
|
|
else {
|
|
/* sys.path_hooks.append(zipimporter) */
|
|
err = PyList_Append(path_hooks, zipimporter);
|
|
Py_DECREF(zipimporter);
|
|
if (err)
|
|
goto error;
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr(
|
|
"# installed zipimport hook\n");
|
|
}
|
|
}
|
|
Py_DECREF(path_hooks);
|
|
}
|
|
|
|
void
|
|
_PyImport_Fini(void)
|
|
{
|
|
Py_XDECREF(extensions);
|
|
extensions = NULL;
|
|
PyMem_DEL(_PyImport_Filetab);
|
|
_PyImport_Filetab = NULL;
|
|
}
|
|
|
|
|
|
/* Locking primitives to prevent parallel imports of the same module
|
|
in different threads to return with a partially loaded module.
|
|
These calls are serialized by the global interpreter lock. */
|
|
|
|
#ifdef WITH_THREAD
|
|
|
|
#include "pythread.h"
|
|
|
|
static PyThread_type_lock import_lock = 0;
|
|
static long import_lock_thread = -1;
|
|
static int import_lock_level = 0;
|
|
|
|
static void
|
|
lock_import(void)
|
|
{
|
|
long me = PyThread_get_thread_ident();
|
|
if (me == -1)
|
|
return; /* Too bad */
|
|
if (import_lock == NULL) {
|
|
import_lock = PyThread_allocate_lock();
|
|
if (import_lock == NULL)
|
|
return; /* Nothing much we can do. */
|
|
}
|
|
if (import_lock_thread == me) {
|
|
import_lock_level++;
|
|
return;
|
|
}
|
|
if (import_lock_thread != -1 || !PyThread_acquire_lock(import_lock, 0))
|
|
{
|
|
PyThreadState *tstate = PyEval_SaveThread();
|
|
PyThread_acquire_lock(import_lock, 1);
|
|
PyEval_RestoreThread(tstate);
|
|
}
|
|
import_lock_thread = me;
|
|
import_lock_level = 1;
|
|
}
|
|
|
|
static int
|
|
unlock_import(void)
|
|
{
|
|
long me = PyThread_get_thread_ident();
|
|
if (me == -1 || import_lock == NULL)
|
|
return 0; /* Too bad */
|
|
if (import_lock_thread != me)
|
|
return -1;
|
|
import_lock_level--;
|
|
if (import_lock_level == 0) {
|
|
import_lock_thread = -1;
|
|
PyThread_release_lock(import_lock);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
/* This function is called from PyOS_AfterFork to ensure that newly
|
|
created child processes do not share locks with the parent. */
|
|
|
|
void
|
|
_PyImport_ReInitLock(void)
|
|
{
|
|
#ifdef _AIX
|
|
if (import_lock != NULL)
|
|
import_lock = PyThread_allocate_lock();
|
|
#endif
|
|
}
|
|
|
|
#else
|
|
|
|
#define lock_import()
|
|
#define unlock_import() 0
|
|
|
|
#endif
|
|
|
|
static PyObject *
|
|
imp_lock_held(PyObject *self, PyObject *noargs)
|
|
{
|
|
#ifdef WITH_THREAD
|
|
return PyBool_FromLong(import_lock_thread != -1);
|
|
#else
|
|
return PyBool_FromLong(0);
|
|
#endif
|
|
}
|
|
|
|
static PyObject *
|
|
imp_acquire_lock(PyObject *self, PyObject *noargs)
|
|
{
|
|
#ifdef WITH_THREAD
|
|
lock_import();
|
|
#endif
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
static PyObject *
|
|
imp_release_lock(PyObject *self, PyObject *noargs)
|
|
{
|
|
#ifdef WITH_THREAD
|
|
if (unlock_import() < 0) {
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"not holding the import lock");
|
|
return NULL;
|
|
}
|
|
#endif
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
static void
|
|
imp_modules_reloading_clear(void)
|
|
{
|
|
PyInterpreterState *interp = PyThreadState_Get()->interp;
|
|
if (interp->modules_reloading != NULL)
|
|
PyDict_Clear(interp->modules_reloading);
|
|
}
|
|
|
|
/* Helper for sys */
|
|
|
|
PyObject *
|
|
PyImport_GetModuleDict(void)
|
|
{
|
|
PyInterpreterState *interp = PyThreadState_GET()->interp;
|
|
if (interp->modules == NULL)
|
|
Py_FatalError("PyImport_GetModuleDict: no module dictionary!");
|
|
return interp->modules;
|
|
}
|
|
|
|
|
|
/* List of names to clear in sys */
|
|
static char* sys_deletes[] = {
|
|
"path", "argv", "ps1", "ps2",
|
|
"exc_type", "exc_value", "exc_traceback",
|
|
"last_type", "last_value", "last_traceback",
|
|
"path_hooks", "path_importer_cache", "meta_path",
|
|
NULL
|
|
};
|
|
|
|
static char* sys_files[] = {
|
|
"stdin", "__stdin__",
|
|
"stdout", "__stdout__",
|
|
"stderr", "__stderr__",
|
|
NULL
|
|
};
|
|
|
|
|
|
/* Un-initialize things, as good as we can */
|
|
|
|
void
|
|
PyImport_Cleanup(void)
|
|
{
|
|
Py_ssize_t pos, ndone;
|
|
char *name;
|
|
PyObject *key, *value, *dict;
|
|
PyInterpreterState *interp = PyThreadState_GET()->interp;
|
|
PyObject *modules = interp->modules;
|
|
|
|
if (modules == NULL)
|
|
return; /* Already done */
|
|
|
|
/* Delete some special variables first. These are common
|
|
places where user values hide and people complain when their
|
|
destructors fail. Since the modules containing them are
|
|
deleted *last* of all, they would come too late in the normal
|
|
destruction order. Sigh. */
|
|
|
|
value = PyDict_GetItemString(modules, "__builtin__");
|
|
if (value != NULL && PyModule_Check(value)) {
|
|
dict = PyModule_GetDict(value);
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# clear __builtin__._\n");
|
|
PyDict_SetItemString(dict, "_", Py_None);
|
|
}
|
|
value = PyDict_GetItemString(modules, "sys");
|
|
if (value != NULL && PyModule_Check(value)) {
|
|
char **p;
|
|
PyObject *v;
|
|
dict = PyModule_GetDict(value);
|
|
for (p = sys_deletes; *p != NULL; p++) {
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# clear sys.%s\n", *p);
|
|
PyDict_SetItemString(dict, *p, Py_None);
|
|
}
|
|
for (p = sys_files; *p != NULL; p+=2) {
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# restore sys.%s\n", *p);
|
|
v = PyDict_GetItemString(dict, *(p+1));
|
|
if (v == NULL)
|
|
v = Py_None;
|
|
PyDict_SetItemString(dict, *p, v);
|
|
}
|
|
}
|
|
|
|
/* First, delete __main__ */
|
|
value = PyDict_GetItemString(modules, "__main__");
|
|
if (value != NULL && PyModule_Check(value)) {
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# cleanup __main__\n");
|
|
_PyModule_Clear(value);
|
|
PyDict_SetItemString(modules, "__main__", Py_None);
|
|
}
|
|
|
|
/* The special treatment of __builtin__ here is because even
|
|
when it's not referenced as a module, its dictionary is
|
|
referenced by almost every module's __builtins__. Since
|
|
deleting a module clears its dictionary (even if there are
|
|
references left to it), we need to delete the __builtin__
|
|
module last. Likewise, we don't delete sys until the very
|
|
end because it is implicitly referenced (e.g. by print).
|
|
|
|
Also note that we 'delete' modules by replacing their entry
|
|
in the modules dict with None, rather than really deleting
|
|
them; this avoids a rehash of the modules dictionary and
|
|
also marks them as "non existent" so they won't be
|
|
re-imported. */
|
|
|
|
/* Next, repeatedly delete modules with a reference count of
|
|
one (skipping __builtin__ and sys) and delete them */
|
|
do {
|
|
ndone = 0;
|
|
pos = 0;
|
|
while (PyDict_Next(modules, &pos, &key, &value)) {
|
|
if (value->ob_refcnt != 1)
|
|
continue;
|
|
if (PyString_Check(key) && PyModule_Check(value)) {
|
|
name = PyString_AS_STRING(key);
|
|
if (strcmp(name, "__builtin__") == 0)
|
|
continue;
|
|
if (strcmp(name, "sys") == 0)
|
|
continue;
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr(
|
|
"# cleanup[1] %s\n", name);
|
|
_PyModule_Clear(value);
|
|
PyDict_SetItem(modules, key, Py_None);
|
|
ndone++;
|
|
}
|
|
}
|
|
} while (ndone > 0);
|
|
|
|
/* Next, delete all modules (still skipping __builtin__ and sys) */
|
|
pos = 0;
|
|
while (PyDict_Next(modules, &pos, &key, &value)) {
|
|
if (PyString_Check(key) && PyModule_Check(value)) {
|
|
name = PyString_AS_STRING(key);
|
|
if (strcmp(name, "__builtin__") == 0)
|
|
continue;
|
|
if (strcmp(name, "sys") == 0)
|
|
continue;
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# cleanup[2] %s\n", name);
|
|
_PyModule_Clear(value);
|
|
PyDict_SetItem(modules, key, Py_None);
|
|
}
|
|
}
|
|
|
|
/* Next, delete sys and __builtin__ (in that order) */
|
|
value = PyDict_GetItemString(modules, "sys");
|
|
if (value != NULL && PyModule_Check(value)) {
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# cleanup sys\n");
|
|
_PyModule_Clear(value);
|
|
PyDict_SetItemString(modules, "sys", Py_None);
|
|
}
|
|
value = PyDict_GetItemString(modules, "__builtin__");
|
|
if (value != NULL && PyModule_Check(value)) {
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# cleanup __builtin__\n");
|
|
_PyModule_Clear(value);
|
|
PyDict_SetItemString(modules, "__builtin__", Py_None);
|
|
}
|
|
|
|
/* Finally, clear and delete the modules directory */
|
|
PyDict_Clear(modules);
|
|
interp->modules = NULL;
|
|
Py_DECREF(modules);
|
|
Py_CLEAR(interp->modules_reloading);
|
|
}
|
|
|
|
|
|
/* Helper for pythonrun.c -- return magic number */
|
|
|
|
long
|
|
PyImport_GetMagicNumber(void)
|
|
{
|
|
return pyc_magic;
|
|
}
|
|
|
|
|
|
/* Magic for extension modules (built-in as well as dynamically
|
|
loaded). To prevent initializing an extension module more than
|
|
once, we keep a static dictionary 'extensions' keyed by module name
|
|
(for built-in modules) or by filename (for dynamically loaded
|
|
modules), containing these modules. A copy of the module's
|
|
dictionary is stored by calling _PyImport_FixupExtension()
|
|
immediately after the module initialization function succeeds. A
|
|
copy can be retrieved from there by calling
|
|
_PyImport_FindExtension(). */
|
|
|
|
PyObject *
|
|
_PyImport_FixupExtension(char *name, char *filename)
|
|
{
|
|
PyObject *modules, *mod, *dict, *copy;
|
|
if (extensions == NULL) {
|
|
extensions = PyDict_New();
|
|
if (extensions == NULL)
|
|
return NULL;
|
|
}
|
|
modules = PyImport_GetModuleDict();
|
|
mod = PyDict_GetItemString(modules, name);
|
|
if (mod == NULL || !PyModule_Check(mod)) {
|
|
PyErr_Format(PyExc_SystemError,
|
|
"_PyImport_FixupExtension: module %.200s not loaded", name);
|
|
return NULL;
|
|
}
|
|
dict = PyModule_GetDict(mod);
|
|
if (dict == NULL)
|
|
return NULL;
|
|
copy = PyDict_Copy(dict);
|
|
if (copy == NULL)
|
|
return NULL;
|
|
PyDict_SetItemString(extensions, filename, copy);
|
|
Py_DECREF(copy);
|
|
return copy;
|
|
}
|
|
|
|
PyObject *
|
|
_PyImport_FindExtension(char *name, char *filename)
|
|
{
|
|
PyObject *dict, *mod, *mdict;
|
|
if (extensions == NULL)
|
|
return NULL;
|
|
dict = PyDict_GetItemString(extensions, filename);
|
|
if (dict == NULL)
|
|
return NULL;
|
|
mod = PyImport_AddModule(name);
|
|
if (mod == NULL)
|
|
return NULL;
|
|
mdict = PyModule_GetDict(mod);
|
|
if (mdict == NULL)
|
|
return NULL;
|
|
if (PyDict_Update(mdict, dict))
|
|
return NULL;
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("import %s # previously loaded (%s)\n",
|
|
name, filename);
|
|
return mod;
|
|
}
|
|
|
|
|
|
/* Get the module object corresponding to a module name.
|
|
First check the modules dictionary if there's one there,
|
|
if not, create a new one and insert it in the modules dictionary.
|
|
Because the former action is most common, THIS DOES NOT RETURN A
|
|
'NEW' REFERENCE! */
|
|
|
|
PyObject *
|
|
PyImport_AddModule(const char *name)
|
|
{
|
|
PyObject *modules = PyImport_GetModuleDict();
|
|
PyObject *m;
|
|
|
|
if ((m = PyDict_GetItemString(modules, name)) != NULL &&
|
|
PyModule_Check(m))
|
|
return m;
|
|
m = PyModule_New(name);
|
|
if (m == NULL)
|
|
return NULL;
|
|
if (PyDict_SetItemString(modules, name, m) != 0) {
|
|
Py_DECREF(m);
|
|
return NULL;
|
|
}
|
|
Py_DECREF(m); /* Yes, it still exists, in modules! */
|
|
|
|
return m;
|
|
}
|
|
|
|
/* Remove name from sys.modules, if it's there. */
|
|
static void
|
|
_RemoveModule(const char *name)
|
|
{
|
|
PyObject *modules = PyImport_GetModuleDict();
|
|
if (PyDict_GetItemString(modules, name) == NULL)
|
|
return;
|
|
if (PyDict_DelItemString(modules, name) < 0)
|
|
Py_FatalError("import: deleting existing key in"
|
|
"sys.modules failed");
|
|
}
|
|
|
|
/* Execute a code object in a module and return the module object
|
|
* WITH INCREMENTED REFERENCE COUNT. If an error occurs, name is
|
|
* removed from sys.modules, to avoid leaving damaged module objects
|
|
* in sys.modules. The caller may wish to restore the original
|
|
* module object (if any) in this case; PyImport_ReloadModule is an
|
|
* example.
|
|
*/
|
|
PyObject *
|
|
PyImport_ExecCodeModule(char *name, PyObject *co)
|
|
{
|
|
return PyImport_ExecCodeModuleEx(name, co, (char *)NULL);
|
|
}
|
|
|
|
PyObject *
|
|
PyImport_ExecCodeModuleEx(char *name, PyObject *co, char *pathname)
|
|
{
|
|
PyObject *modules = PyImport_GetModuleDict();
|
|
PyObject *m, *d, *v;
|
|
|
|
m = PyImport_AddModule(name);
|
|
if (m == NULL)
|
|
return NULL;
|
|
/* If the module is being reloaded, we get the old module back
|
|
and re-use its dict to exec the new code. */
|
|
d = PyModule_GetDict(m);
|
|
if (PyDict_GetItemString(d, "__builtins__") == NULL) {
|
|
if (PyDict_SetItemString(d, "__builtins__",
|
|
PyEval_GetBuiltins()) != 0)
|
|
goto error;
|
|
}
|
|
/* Remember the filename as the __file__ attribute */
|
|
v = NULL;
|
|
if (pathname != NULL) {
|
|
v = PyString_FromString(pathname);
|
|
if (v == NULL)
|
|
PyErr_Clear();
|
|
}
|
|
if (v == NULL) {
|
|
v = ((PyCodeObject *)co)->co_filename;
|
|
Py_INCREF(v);
|
|
}
|
|
if (PyDict_SetItemString(d, "__file__", v) != 0)
|
|
PyErr_Clear(); /* Not important enough to report */
|
|
Py_DECREF(v);
|
|
|
|
v = PyEval_EvalCode((PyCodeObject *)co, d, d);
|
|
if (v == NULL)
|
|
goto error;
|
|
Py_DECREF(v);
|
|
|
|
if ((m = PyDict_GetItemString(modules, name)) == NULL) {
|
|
PyErr_Format(PyExc_ImportError,
|
|
"Loaded module %.200s not found in sys.modules",
|
|
name);
|
|
return NULL;
|
|
}
|
|
|
|
Py_INCREF(m);
|
|
|
|
return m;
|
|
|
|
error:
|
|
_RemoveModule(name);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/* Given a pathname for a Python source file, fill a buffer with the
|
|
pathname for the corresponding compiled file. Return the pathname
|
|
for the compiled file, or NULL if there's no space in the buffer.
|
|
Doesn't set an exception. */
|
|
|
|
static char *
|
|
make_compiled_pathname(char *pathname, char *buf, size_t buflen)
|
|
{
|
|
size_t len = strlen(pathname);
|
|
if (len+2 > buflen)
|
|
return NULL;
|
|
|
|
#ifdef MS_WINDOWS
|
|
/* Treat .pyw as if it were .py. The case of ".pyw" must match
|
|
that used in _PyImport_StandardFiletab. */
|
|
if (len >= 4 && strcmp(&pathname[len-4], ".pyw") == 0)
|
|
--len; /* pretend 'w' isn't there */
|
|
#endif
|
|
memcpy(buf, pathname, len);
|
|
buf[len] = Py_OptimizeFlag ? 'o' : 'c';
|
|
buf[len+1] = '\0';
|
|
|
|
return buf;
|
|
}
|
|
|
|
|
|
/* Given a pathname for a Python source file, its time of last
|
|
modification, and a pathname for a compiled file, check whether the
|
|
compiled file represents the same version of the source. If so,
|
|
return a FILE pointer for the compiled file, positioned just after
|
|
the header; if not, return NULL.
|
|
Doesn't set an exception. */
|
|
|
|
static FILE *
|
|
check_compiled_module(char *pathname, time_t mtime, char *cpathname)
|
|
{
|
|
FILE *fp;
|
|
long magic;
|
|
long pyc_mtime;
|
|
|
|
fp = fopen(cpathname, "rb");
|
|
if (fp == NULL)
|
|
return NULL;
|
|
magic = PyMarshal_ReadLongFromFile(fp);
|
|
if (magic != pyc_magic) {
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# %s has bad magic\n", cpathname);
|
|
fclose(fp);
|
|
return NULL;
|
|
}
|
|
pyc_mtime = PyMarshal_ReadLongFromFile(fp);
|
|
if (pyc_mtime != mtime) {
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# %s has bad mtime\n", cpathname);
|
|
fclose(fp);
|
|
return NULL;
|
|
}
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# %s matches %s\n", cpathname, pathname);
|
|
return fp;
|
|
}
|
|
|
|
|
|
/* Read a code object from a file and check it for validity */
|
|
|
|
static PyCodeObject *
|
|
read_compiled_module(char *cpathname, FILE *fp)
|
|
{
|
|
PyObject *co;
|
|
|
|
co = PyMarshal_ReadLastObjectFromFile(fp);
|
|
if (co == NULL)
|
|
return NULL;
|
|
if (!PyCode_Check(co)) {
|
|
PyErr_Format(PyExc_ImportError,
|
|
"Non-code object in %.200s", cpathname);
|
|
Py_DECREF(co);
|
|
return NULL;
|
|
}
|
|
return (PyCodeObject *)co;
|
|
}
|
|
|
|
|
|
/* Load a module from a compiled file, execute it, and return its
|
|
module object WITH INCREMENTED REFERENCE COUNT */
|
|
|
|
static PyObject *
|
|
load_compiled_module(char *name, char *cpathname, FILE *fp)
|
|
{
|
|
long magic;
|
|
PyCodeObject *co;
|
|
PyObject *m;
|
|
|
|
magic = PyMarshal_ReadLongFromFile(fp);
|
|
if (magic != pyc_magic) {
|
|
PyErr_Format(PyExc_ImportError,
|
|
"Bad magic number in %.200s", cpathname);
|
|
return NULL;
|
|
}
|
|
(void) PyMarshal_ReadLongFromFile(fp);
|
|
co = read_compiled_module(cpathname, fp);
|
|
if (co == NULL)
|
|
return NULL;
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("import %s # precompiled from %s\n",
|
|
name, cpathname);
|
|
m = PyImport_ExecCodeModuleEx(name, (PyObject *)co, cpathname);
|
|
Py_DECREF(co);
|
|
|
|
return m;
|
|
}
|
|
|
|
/* Parse a source file and return the corresponding code object */
|
|
|
|
static PyCodeObject *
|
|
parse_source_module(const char *pathname, FILE *fp)
|
|
{
|
|
PyCodeObject *co = NULL;
|
|
mod_ty mod;
|
|
PyArena *arena = PyArena_New();
|
|
if (arena == NULL)
|
|
return NULL;
|
|
|
|
mod = PyParser_ASTFromFile(fp, pathname, Py_file_input, 0, 0, 0,
|
|
NULL, arena);
|
|
if (mod) {
|
|
co = PyAST_Compile(mod, pathname, NULL, arena);
|
|
}
|
|
PyArena_Free(arena);
|
|
return co;
|
|
}
|
|
|
|
|
|
/* Helper to open a bytecode file for writing in exclusive mode */
|
|
|
|
static FILE *
|
|
open_exclusive(char *filename)
|
|
{
|
|
#if defined(O_EXCL)&&defined(O_CREAT)&&defined(O_WRONLY)&&defined(O_TRUNC)
|
|
/* Use O_EXCL to avoid a race condition when another process tries to
|
|
write the same file. When that happens, our open() call fails,
|
|
which is just fine (since it's only a cache).
|
|
XXX If the file exists and is writable but the directory is not
|
|
writable, the file will never be written. Oh well.
|
|
*/
|
|
int fd;
|
|
(void) unlink(filename);
|
|
fd = open(filename, O_EXCL|O_CREAT|O_WRONLY|O_TRUNC
|
|
#ifdef O_BINARY
|
|
|O_BINARY /* necessary for Windows */
|
|
#endif
|
|
#ifdef __VMS
|
|
, 0666, "ctxt=bin", "shr=nil"
|
|
#else
|
|
, 0666
|
|
#endif
|
|
);
|
|
if (fd < 0)
|
|
return NULL;
|
|
return fdopen(fd, "wb");
|
|
#else
|
|
/* Best we can do -- on Windows this can't happen anyway */
|
|
return fopen(filename, "wb");
|
|
#endif
|
|
}
|
|
|
|
|
|
/* Write a compiled module to a file, placing the time of last
|
|
modification of its source into the header.
|
|
Errors are ignored, if a write error occurs an attempt is made to
|
|
remove the file. */
|
|
|
|
static void
|
|
write_compiled_module(PyCodeObject *co, char *cpathname, time_t mtime)
|
|
{
|
|
FILE *fp;
|
|
|
|
fp = open_exclusive(cpathname);
|
|
if (fp == NULL) {
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr(
|
|
"# can't create %s\n", cpathname);
|
|
return;
|
|
}
|
|
PyMarshal_WriteLongToFile(pyc_magic, fp, Py_MARSHAL_VERSION);
|
|
/* First write a 0 for mtime */
|
|
PyMarshal_WriteLongToFile(0L, fp, Py_MARSHAL_VERSION);
|
|
PyMarshal_WriteObjectToFile((PyObject *)co, fp, Py_MARSHAL_VERSION);
|
|
if (fflush(fp) != 0 || ferror(fp)) {
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# can't write %s\n", cpathname);
|
|
/* Don't keep partial file */
|
|
fclose(fp);
|
|
(void) unlink(cpathname);
|
|
return;
|
|
}
|
|
/* Now write the true mtime */
|
|
fseek(fp, 4L, 0);
|
|
assert(mtime < LONG_MAX);
|
|
PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION);
|
|
fflush(fp);
|
|
fclose(fp);
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("# wrote %s\n", cpathname);
|
|
}
|
|
|
|
|
|
/* Load a source module from a given file and return its module
|
|
object WITH INCREMENTED REFERENCE COUNT. If there's a matching
|
|
byte-compiled file, use that instead. */
|
|
|
|
static PyObject *
|
|
load_source_module(char *name, char *pathname, FILE *fp)
|
|
{
|
|
time_t mtime;
|
|
FILE *fpc;
|
|
char buf[MAXPATHLEN+1];
|
|
char *cpathname;
|
|
PyCodeObject *co;
|
|
PyObject *m;
|
|
|
|
mtime = PyOS_GetLastModificationTime(pathname, fp);
|
|
if (mtime == (time_t)(-1)) {
|
|
PyErr_Format(PyExc_RuntimeError,
|
|
"unable to get modification time from '%s'",
|
|
pathname);
|
|
return NULL;
|
|
}
|
|
#if SIZEOF_TIME_T > 4
|
|
/* Python's .pyc timestamp handling presumes that the timestamp fits
|
|
in 4 bytes. This will be fine until sometime in the year 2038,
|
|
when a 4-byte signed time_t will overflow.
|
|
*/
|
|
if (mtime >> 32) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"modification time overflows a 4 byte field");
|
|
return NULL;
|
|
}
|
|
#endif
|
|
cpathname = make_compiled_pathname(pathname, buf,
|
|
(size_t)MAXPATHLEN + 1);
|
|
if (cpathname != NULL &&
|
|
(fpc = check_compiled_module(pathname, mtime, cpathname))) {
|
|
co = read_compiled_module(cpathname, fpc);
|
|
fclose(fpc);
|
|
if (co == NULL)
|
|
return NULL;
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("import %s # precompiled from %s\n",
|
|
name, cpathname);
|
|
pathname = cpathname;
|
|
}
|
|
else {
|
|
co = parse_source_module(pathname, fp);
|
|
if (co == NULL)
|
|
return NULL;
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("import %s # from %s\n",
|
|
name, pathname);
|
|
if (cpathname)
|
|
write_compiled_module(co, cpathname, mtime);
|
|
}
|
|
m = PyImport_ExecCodeModuleEx(name, (PyObject *)co, pathname);
|
|
Py_DECREF(co);
|
|
|
|
return m;
|
|
}
|
|
|
|
|
|
/* Forward */
|
|
static PyObject *load_module(char *, FILE *, char *, int, PyObject *);
|
|
static struct filedescr *find_module(char *, char *, PyObject *,
|
|
char *, size_t, FILE **, PyObject **);
|
|
static struct _frozen *find_frozen(char *name);
|
|
|
|
/* Load a package and return its module object WITH INCREMENTED
|
|
REFERENCE COUNT */
|
|
|
|
static PyObject *
|
|
load_package(char *name, char *pathname)
|
|
{
|
|
PyObject *m, *d;
|
|
PyObject *file = NULL;
|
|
PyObject *path = NULL;
|
|
int err;
|
|
char buf[MAXPATHLEN+1];
|
|
FILE *fp = NULL;
|
|
struct filedescr *fdp;
|
|
|
|
m = PyImport_AddModule(name);
|
|
if (m == NULL)
|
|
return NULL;
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("import %s # directory %s\n",
|
|
name, pathname);
|
|
d = PyModule_GetDict(m);
|
|
file = PyString_FromString(pathname);
|
|
if (file == NULL)
|
|
goto error;
|
|
path = Py_BuildValue("[O]", file);
|
|
if (path == NULL)
|
|
goto error;
|
|
err = PyDict_SetItemString(d, "__file__", file);
|
|
if (err == 0)
|
|
err = PyDict_SetItemString(d, "__path__", path);
|
|
if (err != 0)
|
|
goto error;
|
|
buf[0] = '\0';
|
|
fdp = find_module(name, "__init__", path, buf, sizeof(buf), &fp, NULL);
|
|
if (fdp == NULL) {
|
|
if (PyErr_ExceptionMatches(PyExc_ImportError)) {
|
|
PyErr_Clear();
|
|
Py_INCREF(m);
|
|
}
|
|
else
|
|
m = NULL;
|
|
goto cleanup;
|
|
}
|
|
m = load_module(name, fp, buf, fdp->type, NULL);
|
|
if (fp != NULL)
|
|
fclose(fp);
|
|
goto cleanup;
|
|
|
|
error:
|
|
m = NULL;
|
|
cleanup:
|
|
Py_XDECREF(path);
|
|
Py_XDECREF(file);
|
|
return m;
|
|
}
|
|
|
|
|
|
/* Helper to test for built-in module */
|
|
|
|
static int
|
|
is_builtin(char *name)
|
|
{
|
|
int i;
|
|
for (i = 0; PyImport_Inittab[i].name != NULL; i++) {
|
|
if (strcmp(name, PyImport_Inittab[i].name) == 0) {
|
|
if (PyImport_Inittab[i].initfunc == NULL)
|
|
return -1;
|
|
else
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Return an importer object for a sys.path/pkg.__path__ item 'p',
|
|
possibly by fetching it from the path_importer_cache dict. If it
|
|
wasn't yet cached, traverse path_hooks until a hook is found
|
|
that can handle the path item. Return None if no hook could;
|
|
this tells our caller it should fall back to the builtin
|
|
import mechanism. Cache the result in path_importer_cache.
|
|
Returns a borrowed reference. */
|
|
|
|
static PyObject *
|
|
get_path_importer(PyObject *path_importer_cache, PyObject *path_hooks,
|
|
PyObject *p)
|
|
{
|
|
PyObject *importer;
|
|
Py_ssize_t j, nhooks;
|
|
|
|
/* These conditions are the caller's responsibility: */
|
|
assert(PyList_Check(path_hooks));
|
|
assert(PyDict_Check(path_importer_cache));
|
|
|
|
nhooks = PyList_Size(path_hooks);
|
|
if (nhooks < 0)
|
|
return NULL; /* Shouldn't happen */
|
|
|
|
importer = PyDict_GetItem(path_importer_cache, p);
|
|
if (importer != NULL)
|
|
return importer;
|
|
|
|
/* set path_importer_cache[p] to None to avoid recursion */
|
|
if (PyDict_SetItem(path_importer_cache, p, Py_None) != 0)
|
|
return NULL;
|
|
|
|
for (j = 0; j < nhooks; j++) {
|
|
PyObject *hook = PyList_GetItem(path_hooks, j);
|
|
if (hook == NULL)
|
|
return NULL;
|
|
importer = PyObject_CallFunctionObjArgs(hook, p, NULL);
|
|
if (importer != NULL)
|
|
break;
|
|
|
|
if (!PyErr_ExceptionMatches(PyExc_ImportError)) {
|
|
return NULL;
|
|
}
|
|
PyErr_Clear();
|
|
}
|
|
if (importer == NULL) {
|
|
importer = PyObject_CallFunctionObjArgs(
|
|
(PyObject *)&NullImporterType, p, NULL
|
|
);
|
|
if (importer == NULL) {
|
|
if (PyErr_ExceptionMatches(PyExc_ImportError)) {
|
|
PyErr_Clear();
|
|
return Py_None;
|
|
}
|
|
}
|
|
}
|
|
if (importer != NULL) {
|
|
int err = PyDict_SetItem(path_importer_cache, p, importer);
|
|
Py_DECREF(importer);
|
|
if (err != 0)
|
|
return NULL;
|
|
}
|
|
return importer;
|
|
}
|
|
|
|
/* Search the path (default sys.path) for a module. Return the
|
|
corresponding filedescr struct, and (via return arguments) the
|
|
pathname and an open file. Return NULL if the module is not found. */
|
|
|
|
#ifdef MS_COREDLL
|
|
extern FILE *PyWin_FindRegisteredModule(const char *, struct filedescr **,
|
|
char *, Py_ssize_t);
|
|
#endif
|
|
|
|
static int case_ok(char *, Py_ssize_t, Py_ssize_t, char *);
|
|
static int find_init_module(char *); /* Forward */
|
|
static struct filedescr importhookdescr = {"", "", IMP_HOOK};
|
|
|
|
static struct filedescr *
|
|
find_module(char *fullname, char *subname, PyObject *path, char *buf,
|
|
size_t buflen, FILE **p_fp, PyObject **p_loader)
|
|
{
|
|
Py_ssize_t i, npath;
|
|
size_t len, namelen;
|
|
struct filedescr *fdp = NULL;
|
|
char *filemode;
|
|
FILE *fp = NULL;
|
|
PyObject *path_hooks, *path_importer_cache;
|
|
#ifndef RISCOS
|
|
struct stat statbuf;
|
|
#endif
|
|
static struct filedescr fd_frozen = {"", "", PY_FROZEN};
|
|
static struct filedescr fd_builtin = {"", "", C_BUILTIN};
|
|
static struct filedescr fd_package = {"", "", PKG_DIRECTORY};
|
|
char name[MAXPATHLEN+1];
|
|
#if defined(PYOS_OS2)
|
|
size_t saved_len;
|
|
size_t saved_namelen;
|
|
char *saved_buf = NULL;
|
|
#endif
|
|
if (p_loader != NULL)
|
|
*p_loader = NULL;
|
|
|
|
if (strlen(subname) > MAXPATHLEN) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"module name is too long");
|
|
return NULL;
|
|
}
|
|
strcpy(name, subname);
|
|
|
|
/* sys.meta_path import hook */
|
|
if (p_loader != NULL) {
|
|
PyObject *meta_path;
|
|
|
|
meta_path = PySys_GetObject("meta_path");
|
|
if (meta_path == NULL || !PyList_Check(meta_path)) {
|
|
PyErr_SetString(PyExc_ImportError,
|
|
"sys.meta_path must be a list of "
|
|
"import hooks");
|
|
return NULL;
|
|
}
|
|
Py_INCREF(meta_path); /* zap guard */
|
|
npath = PyList_Size(meta_path);
|
|
for (i = 0; i < npath; i++) {
|
|
PyObject *loader;
|
|
PyObject *hook = PyList_GetItem(meta_path, i);
|
|
loader = PyObject_CallMethod(hook, "find_module",
|
|
"sO", fullname,
|
|
path != NULL ?
|
|
path : Py_None);
|
|
if (loader == NULL) {
|
|
Py_DECREF(meta_path);
|
|
return NULL; /* true error */
|
|
}
|
|
if (loader != Py_None) {
|
|
/* a loader was found */
|
|
*p_loader = loader;
|
|
Py_DECREF(meta_path);
|
|
return &importhookdescr;
|
|
}
|
|
Py_DECREF(loader);
|
|
}
|
|
Py_DECREF(meta_path);
|
|
}
|
|
|
|
if (path != NULL && PyString_Check(path)) {
|
|
/* The only type of submodule allowed inside a "frozen"
|
|
package are other frozen modules or packages. */
|
|
if (PyString_Size(path) + 1 + strlen(name) >= (size_t)buflen) {
|
|
PyErr_SetString(PyExc_ImportError,
|
|
"full frozen module name too long");
|
|
return NULL;
|
|
}
|
|
strcpy(buf, PyString_AsString(path));
|
|
strcat(buf, ".");
|
|
strcat(buf, name);
|
|
strcpy(name, buf);
|
|
if (find_frozen(name) != NULL) {
|
|
strcpy(buf, name);
|
|
return &fd_frozen;
|
|
}
|
|
PyErr_Format(PyExc_ImportError,
|
|
"No frozen submodule named %.200s", name);
|
|
return NULL;
|
|
}
|
|
if (path == NULL) {
|
|
if (is_builtin(name)) {
|
|
strcpy(buf, name);
|
|
return &fd_builtin;
|
|
}
|
|
if ((find_frozen(name)) != NULL) {
|
|
strcpy(buf, name);
|
|
return &fd_frozen;
|
|
}
|
|
|
|
#ifdef MS_COREDLL
|
|
fp = PyWin_FindRegisteredModule(name, &fdp, buf, buflen);
|
|
if (fp != NULL) {
|
|
*p_fp = fp;
|
|
return fdp;
|
|
}
|
|
#endif
|
|
path = PySys_GetObject("path");
|
|
}
|
|
if (path == NULL || !PyList_Check(path)) {
|
|
PyErr_SetString(PyExc_ImportError,
|
|
"sys.path must be a list of directory names");
|
|
return NULL;
|
|
}
|
|
|
|
path_hooks = PySys_GetObject("path_hooks");
|
|
if (path_hooks == NULL || !PyList_Check(path_hooks)) {
|
|
PyErr_SetString(PyExc_ImportError,
|
|
"sys.path_hooks must be a list of "
|
|
"import hooks");
|
|
return NULL;
|
|
}
|
|
path_importer_cache = PySys_GetObject("path_importer_cache");
|
|
if (path_importer_cache == NULL ||
|
|
!PyDict_Check(path_importer_cache)) {
|
|
PyErr_SetString(PyExc_ImportError,
|
|
"sys.path_importer_cache must be a dict");
|
|
return NULL;
|
|
}
|
|
|
|
npath = PyList_Size(path);
|
|
namelen = strlen(name);
|
|
for (i = 0; i < npath; i++) {
|
|
PyObject *copy = NULL;
|
|
PyObject *v = PyList_GetItem(path, i);
|
|
if (!v)
|
|
return NULL;
|
|
#ifdef Py_USING_UNICODE
|
|
if (PyUnicode_Check(v)) {
|
|
copy = PyUnicode_Encode(PyUnicode_AS_UNICODE(v),
|
|
PyUnicode_GET_SIZE(v), Py_FileSystemDefaultEncoding, NULL);
|
|
if (copy == NULL)
|
|
return NULL;
|
|
v = copy;
|
|
}
|
|
else
|
|
#endif
|
|
if (!PyString_Check(v))
|
|
continue;
|
|
len = PyString_GET_SIZE(v);
|
|
if (len + 2 + namelen + MAXSUFFIXSIZE >= buflen) {
|
|
Py_XDECREF(copy);
|
|
continue; /* Too long */
|
|
}
|
|
strcpy(buf, PyString_AS_STRING(v));
|
|
if (strlen(buf) != len) {
|
|
Py_XDECREF(copy);
|
|
continue; /* v contains '\0' */
|
|
}
|
|
|
|
/* sys.path_hooks import hook */
|
|
if (p_loader != NULL) {
|
|
PyObject *importer;
|
|
|
|
importer = get_path_importer(path_importer_cache,
|
|
path_hooks, v);
|
|
if (importer == NULL) {
|
|
Py_XDECREF(copy);
|
|
return NULL;
|
|
}
|
|
/* Note: importer is a borrowed reference */
|
|
if (importer != Py_None) {
|
|
PyObject *loader;
|
|
loader = PyObject_CallMethod(importer,
|
|
"find_module",
|
|
"s", fullname);
|
|
Py_XDECREF(copy);
|
|
if (loader == NULL)
|
|
return NULL; /* error */
|
|
if (loader != Py_None) {
|
|
/* a loader was found */
|
|
*p_loader = loader;
|
|
return &importhookdescr;
|
|
}
|
|
Py_DECREF(loader);
|
|
continue;
|
|
}
|
|
}
|
|
/* no hook was found, use builtin import */
|
|
|
|
if (len > 0 && buf[len-1] != SEP
|
|
#ifdef ALTSEP
|
|
&& buf[len-1] != ALTSEP
|
|
#endif
|
|
)
|
|
buf[len++] = SEP;
|
|
strcpy(buf+len, name);
|
|
len += namelen;
|
|
|
|
/* Check for package import (buf holds a directory name,
|
|
and there's an __init__ module in that directory */
|
|
#ifdef HAVE_STAT
|
|
if (stat(buf, &statbuf) == 0 && /* it exists */
|
|
S_ISDIR(statbuf.st_mode) && /* it's a directory */
|
|
case_ok(buf, len, namelen, name)) { /* case matches */
|
|
if (find_init_module(buf)) { /* and has __init__.py */
|
|
Py_XDECREF(copy);
|
|
return &fd_package;
|
|
}
|
|
else {
|
|
char warnstr[MAXPATHLEN+80];
|
|
sprintf(warnstr, "Not importing directory "
|
|
"'%.*s': missing __init__.py",
|
|
MAXPATHLEN, buf);
|
|
if (PyErr_Warn(PyExc_ImportWarning,
|
|
warnstr)) {
|
|
Py_XDECREF(copy);
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
#else
|
|
/* XXX How are you going to test for directories? */
|
|
#ifdef RISCOS
|
|
if (isdir(buf) &&
|
|
case_ok(buf, len, namelen, name)) {
|
|
if (find_init_module(buf)) {
|
|
Py_XDECREF(copy);
|
|
return &fd_package;
|
|
}
|
|
else {
|
|
char warnstr[MAXPATHLEN+80];
|
|
sprintf(warnstr, "Not importing directory "
|
|
"'%.*s': missing __init__.py",
|
|
MAXPATHLEN, buf);
|
|
if (PyErr_Warn(PyExc_ImportWarning,
|
|
warnstr)) {
|
|
Py_XDECREF(copy);
|
|
return NULL;
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
#if defined(PYOS_OS2)
|
|
/* take a snapshot of the module spec for restoration
|
|
* after the 8 character DLL hackery
|
|
*/
|
|
saved_buf = strdup(buf);
|
|
saved_len = len;
|
|
saved_namelen = namelen;
|
|
#endif /* PYOS_OS2 */
|
|
for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
|
|
#if defined(PYOS_OS2)
|
|
/* OS/2 limits DLLs to 8 character names (w/o
|
|
extension)
|
|
* so if the name is longer than that and its a
|
|
* dynamically loaded module we're going to try,
|
|
* truncate the name before trying
|
|
*/
|
|
if (strlen(subname) > 8) {
|
|
/* is this an attempt to load a C extension? */
|
|
const struct filedescr *scan;
|
|
scan = _PyImport_DynLoadFiletab;
|
|
while (scan->suffix != NULL) {
|
|
if (!strcmp(scan->suffix, fdp->suffix))
|
|
break;
|
|
else
|
|
scan++;
|
|
}
|
|
if (scan->suffix != NULL) {
|
|
/* yes, so truncate the name */
|
|
namelen = 8;
|
|
len -= strlen(subname) - namelen;
|
|
buf[len] = '\0';
|
|
}
|
|
}
|
|
#endif /* PYOS_OS2 */
|
|
strcpy(buf+len, fdp->suffix);
|
|
if (Py_VerboseFlag > 1)
|
|
PySys_WriteStderr("# trying %s\n", buf);
|
|
filemode = fdp->mode;
|
|
if (filemode[0] == 'U')
|
|
filemode = "r" PY_STDIOTEXTMODE;
|
|
fp = fopen(buf, filemode);
|
|
if (fp != NULL) {
|
|
if (case_ok(buf, len, namelen, name))
|
|
break;
|
|
else { /* continue search */
|
|
fclose(fp);
|
|
fp = NULL;
|
|
}
|
|
}
|
|
#if defined(PYOS_OS2)
|
|
/* restore the saved snapshot */
|
|
strcpy(buf, saved_buf);
|
|
len = saved_len;
|
|
namelen = saved_namelen;
|
|
#endif
|
|
}
|
|
#if defined(PYOS_OS2)
|
|
/* don't need/want the module name snapshot anymore */
|
|
if (saved_buf)
|
|
{
|
|
free(saved_buf);
|
|
saved_buf = NULL;
|
|
}
|
|
#endif
|
|
Py_XDECREF(copy);
|
|
if (fp != NULL)
|
|
break;
|
|
}
|
|
if (fp == NULL) {
|
|
PyErr_Format(PyExc_ImportError,
|
|
"No module named %.200s", name);
|
|
return NULL;
|
|
}
|
|
*p_fp = fp;
|
|
return fdp;
|
|
}
|
|
|
|
/* Helpers for main.c
|
|
* Find the source file corresponding to a named module
|
|
*/
|
|
struct filedescr *
|
|
_PyImport_FindModule(const char *name, PyObject *path, char *buf,
|
|
size_t buflen, FILE **p_fp, PyObject **p_loader)
|
|
{
|
|
return find_module((char *) name, (char *) name, path,
|
|
buf, buflen, p_fp, p_loader);
|
|
}
|
|
|
|
PyAPI_FUNC(int) _PyImport_IsScript(struct filedescr * fd)
|
|
{
|
|
return fd->type == PY_SOURCE || fd->type == PY_COMPILED;
|
|
}
|
|
|
|
/* case_ok(char* buf, Py_ssize_t len, Py_ssize_t namelen, char* name)
|
|
* The arguments here are tricky, best shown by example:
|
|
* /a/b/c/d/e/f/g/h/i/j/k/some_long_module_name.py\0
|
|
* ^ ^ ^ ^
|
|
* |--------------------- buf ---------------------|
|
|
* |------------------- len ------------------|
|
|
* |------ name -------|
|
|
* |----- namelen -----|
|
|
* buf is the full path, but len only counts up to (& exclusive of) the
|
|
* extension. name is the module name, also exclusive of extension.
|
|
*
|
|
* We've already done a successful stat() or fopen() on buf, so know that
|
|
* there's some match, possibly case-insensitive.
|
|
*
|
|
* case_ok() is to return 1 if there's a case-sensitive match for
|
|
* name, else 0. case_ok() is also to return 1 if envar PYTHONCASEOK
|
|
* exists.
|
|
*
|
|
* case_ok() is used to implement case-sensitive import semantics even
|
|
* on platforms with case-insensitive filesystems. It's trivial to implement
|
|
* for case-sensitive filesystems. It's pretty much a cross-platform
|
|
* nightmare for systems with case-insensitive filesystems.
|
|
*/
|
|
|
|
/* First we may need a pile of platform-specific header files; the sequence
|
|
* of #if's here should match the sequence in the body of case_ok().
|
|
*/
|
|
#if defined(MS_WINDOWS)
|
|
#include <windows.h>
|
|
|
|
#elif defined(DJGPP)
|
|
#include <dir.h>
|
|
|
|
#elif (defined(__MACH__) && defined(__APPLE__) || defined(__CYGWIN__)) && defined(HAVE_DIRENT_H)
|
|
#include <sys/types.h>
|
|
#include <dirent.h>
|
|
|
|
#elif defined(PYOS_OS2)
|
|
#define INCL_DOS
|
|
#define INCL_DOSERRORS
|
|
#define INCL_NOPMAPI
|
|
#include <os2.h>
|
|
|
|
#elif defined(RISCOS)
|
|
#include "oslib/osfscontrol.h"
|
|
#endif
|
|
|
|
static int
|
|
case_ok(char *buf, Py_ssize_t len, Py_ssize_t namelen, char *name)
|
|
{
|
|
/* Pick a platform-specific implementation; the sequence of #if's here should
|
|
* match the sequence just above.
|
|
*/
|
|
|
|
/* MS_WINDOWS */
|
|
#if defined(MS_WINDOWS)
|
|
WIN32_FIND_DATA data;
|
|
HANDLE h;
|
|
|
|
if (Py_GETENV("PYTHONCASEOK") != NULL)
|
|
return 1;
|
|
|
|
h = FindFirstFile(buf, &data);
|
|
if (h == INVALID_HANDLE_VALUE) {
|
|
PyErr_Format(PyExc_NameError,
|
|
"Can't find file for module %.100s\n(filename %.300s)",
|
|
name, buf);
|
|
return 0;
|
|
}
|
|
FindClose(h);
|
|
return strncmp(data.cFileName, name, namelen) == 0;
|
|
|
|
/* DJGPP */
|
|
#elif defined(DJGPP)
|
|
struct ffblk ffblk;
|
|
int done;
|
|
|
|
if (Py_GETENV("PYTHONCASEOK") != NULL)
|
|
return 1;
|
|
|
|
done = findfirst(buf, &ffblk, FA_ARCH|FA_RDONLY|FA_HIDDEN|FA_DIREC);
|
|
if (done) {
|
|
PyErr_Format(PyExc_NameError,
|
|
"Can't find file for module %.100s\n(filename %.300s)",
|
|
name, buf);
|
|
return 0;
|
|
}
|
|
return strncmp(ffblk.ff_name, name, namelen) == 0;
|
|
|
|
/* new-fangled macintosh (macosx) or Cygwin */
|
|
#elif (defined(__MACH__) && defined(__APPLE__) || defined(__CYGWIN__)) && defined(HAVE_DIRENT_H)
|
|
DIR *dirp;
|
|
struct dirent *dp;
|
|
char dirname[MAXPATHLEN + 1];
|
|
const int dirlen = len - namelen - 1; /* don't want trailing SEP */
|
|
|
|
if (Py_GETENV("PYTHONCASEOK") != NULL)
|
|
return 1;
|
|
|
|
/* Copy the dir component into dirname; substitute "." if empty */
|
|
if (dirlen <= 0) {
|
|
dirname[0] = '.';
|
|
dirname[1] = '\0';
|
|
}
|
|
else {
|
|
assert(dirlen <= MAXPATHLEN);
|
|
memcpy(dirname, buf, dirlen);
|
|
dirname[dirlen] = '\0';
|
|
}
|
|
/* Open the directory and search the entries for an exact match. */
|
|
dirp = opendir(dirname);
|
|
if (dirp) {
|
|
char *nameWithExt = buf + len - namelen;
|
|
while ((dp = readdir(dirp)) != NULL) {
|
|
const int thislen =
|
|
#ifdef _DIRENT_HAVE_D_NAMELEN
|
|
dp->d_namlen;
|
|
#else
|
|
strlen(dp->d_name);
|
|
#endif
|
|
if (thislen >= namelen &&
|
|
strcmp(dp->d_name, nameWithExt) == 0) {
|
|
(void)closedir(dirp);
|
|
return 1; /* Found */
|
|
}
|
|
}
|
|
(void)closedir(dirp);
|
|
}
|
|
return 0 ; /* Not found */
|
|
|
|
/* RISC OS */
|
|
#elif defined(RISCOS)
|
|
char canon[MAXPATHLEN+1]; /* buffer for the canonical form of the path */
|
|
char buf2[MAXPATHLEN+2];
|
|
char *nameWithExt = buf+len-namelen;
|
|
int canonlen;
|
|
os_error *e;
|
|
|
|
if (Py_GETENV("PYTHONCASEOK") != NULL)
|
|
return 1;
|
|
|
|
/* workaround:
|
|
append wildcard, otherwise case of filename wouldn't be touched */
|
|
strcpy(buf2, buf);
|
|
strcat(buf2, "*");
|
|
|
|
e = xosfscontrol_canonicalise_path(buf2,canon,0,0,MAXPATHLEN+1,&canonlen);
|
|
canonlen = MAXPATHLEN+1-canonlen;
|
|
if (e || canonlen<=0 || canonlen>(MAXPATHLEN+1) )
|
|
return 0;
|
|
if (strcmp(nameWithExt, canon+canonlen-strlen(nameWithExt))==0)
|
|
return 1; /* match */
|
|
|
|
return 0;
|
|
|
|
/* OS/2 */
|
|
#elif defined(PYOS_OS2)
|
|
HDIR hdir = 1;
|
|
ULONG srchcnt = 1;
|
|
FILEFINDBUF3 ffbuf;
|
|
APIRET rc;
|
|
|
|
if (getenv("PYTHONCASEOK") != NULL)
|
|
return 1;
|
|
|
|
rc = DosFindFirst(buf,
|
|
&hdir,
|
|
FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM | FILE_DIRECTORY,
|
|
&ffbuf, sizeof(ffbuf),
|
|
&srchcnt,
|
|
FIL_STANDARD);
|
|
if (rc != NO_ERROR)
|
|
return 0;
|
|
return strncmp(ffbuf.achName, name, namelen) == 0;
|
|
|
|
/* assuming it's a case-sensitive filesystem, so there's nothing to do! */
|
|
#else
|
|
return 1;
|
|
|
|
#endif
|
|
}
|
|
|
|
|
|
#ifdef HAVE_STAT
|
|
/* Helper to look for __init__.py or __init__.py[co] in potential package */
|
|
static int
|
|
find_init_module(char *buf)
|
|
{
|
|
const size_t save_len = strlen(buf);
|
|
size_t i = save_len;
|
|
char *pname; /* pointer to start of __init__ */
|
|
struct stat statbuf;
|
|
|
|
/* For calling case_ok(buf, len, namelen, name):
|
|
* /a/b/c/d/e/f/g/h/i/j/k/some_long_module_name.py\0
|
|
* ^ ^ ^ ^
|
|
* |--------------------- buf ---------------------|
|
|
* |------------------- len ------------------|
|
|
* |------ name -------|
|
|
* |----- namelen -----|
|
|
*/
|
|
if (save_len + 13 >= MAXPATHLEN)
|
|
return 0;
|
|
buf[i++] = SEP;
|
|
pname = buf + i;
|
|
strcpy(pname, "__init__.py");
|
|
if (stat(buf, &statbuf) == 0) {
|
|
if (case_ok(buf,
|
|
save_len + 9, /* len("/__init__") */
|
|
8, /* len("__init__") */
|
|
pname)) {
|
|
buf[save_len] = '\0';
|
|
return 1;
|
|
}
|
|
}
|
|
i += strlen(pname);
|
|
strcpy(buf+i, Py_OptimizeFlag ? "o" : "c");
|
|
if (stat(buf, &statbuf) == 0) {
|
|
if (case_ok(buf,
|
|
save_len + 9, /* len("/__init__") */
|
|
8, /* len("__init__") */
|
|
pname)) {
|
|
buf[save_len] = '\0';
|
|
return 1;
|
|
}
|
|
}
|
|
buf[save_len] = '\0';
|
|
return 0;
|
|
}
|
|
|
|
#else
|
|
|
|
#ifdef RISCOS
|
|
static int
|
|
find_init_module(buf)
|
|
char *buf;
|
|
{
|
|
int save_len = strlen(buf);
|
|
int i = save_len;
|
|
|
|
if (save_len + 13 >= MAXPATHLEN)
|
|
return 0;
|
|
buf[i++] = SEP;
|
|
strcpy(buf+i, "__init__/py");
|
|
if (isfile(buf)) {
|
|
buf[save_len] = '\0';
|
|
return 1;
|
|
}
|
|
|
|
if (Py_OptimizeFlag)
|
|
strcpy(buf+i, "o");
|
|
else
|
|
strcpy(buf+i, "c");
|
|
if (isfile(buf)) {
|
|
buf[save_len] = '\0';
|
|
return 1;
|
|
}
|
|
buf[save_len] = '\0';
|
|
return 0;
|
|
}
|
|
#endif /*RISCOS*/
|
|
|
|
#endif /* HAVE_STAT */
|
|
|
|
|
|
static int init_builtin(char *); /* Forward */
|
|
|
|
/* Load an external module using the default search path and return
|
|
its module object WITH INCREMENTED REFERENCE COUNT */
|
|
|
|
static PyObject *
|
|
load_module(char *name, FILE *fp, char *buf, int type, PyObject *loader)
|
|
{
|
|
PyObject *modules;
|
|
PyObject *m;
|
|
int err;
|
|
|
|
/* First check that there's an open file (if we need one) */
|
|
switch (type) {
|
|
case PY_SOURCE:
|
|
case PY_COMPILED:
|
|
if (fp == NULL) {
|
|
PyErr_Format(PyExc_ValueError,
|
|
"file object required for import (type code %d)",
|
|
type);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
switch (type) {
|
|
|
|
case PY_SOURCE:
|
|
m = load_source_module(name, buf, fp);
|
|
break;
|
|
|
|
case PY_COMPILED:
|
|
m = load_compiled_module(name, buf, fp);
|
|
break;
|
|
|
|
#ifdef HAVE_DYNAMIC_LOADING
|
|
case C_EXTENSION:
|
|
m = _PyImport_LoadDynamicModule(name, buf, fp);
|
|
break;
|
|
#endif
|
|
|
|
case PKG_DIRECTORY:
|
|
m = load_package(name, buf);
|
|
break;
|
|
|
|
case C_BUILTIN:
|
|
case PY_FROZEN:
|
|
if (buf != NULL && buf[0] != '\0')
|
|
name = buf;
|
|
if (type == C_BUILTIN)
|
|
err = init_builtin(name);
|
|
else
|
|
err = PyImport_ImportFrozenModule(name);
|
|
if (err < 0)
|
|
return NULL;
|
|
if (err == 0) {
|
|
PyErr_Format(PyExc_ImportError,
|
|
"Purported %s module %.200s not found",
|
|
type == C_BUILTIN ?
|
|
"builtin" : "frozen",
|
|
name);
|
|
return NULL;
|
|
}
|
|
modules = PyImport_GetModuleDict();
|
|
m = PyDict_GetItemString(modules, name);
|
|
if (m == NULL) {
|
|
PyErr_Format(
|
|
PyExc_ImportError,
|
|
"%s module %.200s not properly initialized",
|
|
type == C_BUILTIN ?
|
|
"builtin" : "frozen",
|
|
name);
|
|
return NULL;
|
|
}
|
|
Py_INCREF(m);
|
|
break;
|
|
|
|
case IMP_HOOK: {
|
|
if (loader == NULL) {
|
|
PyErr_SetString(PyExc_ImportError,
|
|
"import hook without loader");
|
|
return NULL;
|
|
}
|
|
m = PyObject_CallMethod(loader, "load_module", "s", name);
|
|
break;
|
|
}
|
|
|
|
default:
|
|
PyErr_Format(PyExc_ImportError,
|
|
"Don't know how to import %.200s (type code %d)",
|
|
name, type);
|
|
m = NULL;
|
|
|
|
}
|
|
|
|
return m;
|
|
}
|
|
|
|
|
|
/* Initialize a built-in module.
|
|
Return 1 for success, 0 if the module is not found, and -1 with
|
|
an exception set if the initialization failed. */
|
|
|
|
static int
|
|
init_builtin(char *name)
|
|
{
|
|
struct _inittab *p;
|
|
|
|
if (_PyImport_FindExtension(name, name) != NULL)
|
|
return 1;
|
|
|
|
for (p = PyImport_Inittab; p->name != NULL; p++) {
|
|
if (strcmp(name, p->name) == 0) {
|
|
if (p->initfunc == NULL) {
|
|
PyErr_Format(PyExc_ImportError,
|
|
"Cannot re-init internal module %.200s",
|
|
name);
|
|
return -1;
|
|
}
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("import %s # builtin\n", name);
|
|
(*p->initfunc)();
|
|
if (PyErr_Occurred())
|
|
return -1;
|
|
if (_PyImport_FixupExtension(name, name) == NULL)
|
|
return -1;
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Frozen modules */
|
|
|
|
static struct _frozen *
|
|
find_frozen(char *name)
|
|
{
|
|
struct _frozen *p;
|
|
|
|
for (p = PyImport_FrozenModules; ; p++) {
|
|
if (p->name == NULL)
|
|
return NULL;
|
|
if (strcmp(p->name, name) == 0)
|
|
break;
|
|
}
|
|
return p;
|
|
}
|
|
|
|
static PyObject *
|
|
get_frozen_object(char *name)
|
|
{
|
|
struct _frozen *p = find_frozen(name);
|
|
int size;
|
|
|
|
if (p == NULL) {
|
|
PyErr_Format(PyExc_ImportError,
|
|
"No such frozen object named %.200s",
|
|
name);
|
|
return NULL;
|
|
}
|
|
if (p->code == NULL) {
|
|
PyErr_Format(PyExc_ImportError,
|
|
"Excluded frozen object named %.200s",
|
|
name);
|
|
return NULL;
|
|
}
|
|
size = p->size;
|
|
if (size < 0)
|
|
size = -size;
|
|
return PyMarshal_ReadObjectFromString((char *)p->code, size);
|
|
}
|
|
|
|
/* Initialize a frozen module.
|
|
Return 1 for succes, 0 if the module is not found, and -1 with
|
|
an exception set if the initialization failed.
|
|
This function is also used from frozenmain.c */
|
|
|
|
int
|
|
PyImport_ImportFrozenModule(char *name)
|
|
{
|
|
struct _frozen *p = find_frozen(name);
|
|
PyObject *co;
|
|
PyObject *m;
|
|
int ispackage;
|
|
int size;
|
|
|
|
if (p == NULL)
|
|
return 0;
|
|
if (p->code == NULL) {
|
|
PyErr_Format(PyExc_ImportError,
|
|
"Excluded frozen object named %.200s",
|
|
name);
|
|
return -1;
|
|
}
|
|
size = p->size;
|
|
ispackage = (size < 0);
|
|
if (ispackage)
|
|
size = -size;
|
|
if (Py_VerboseFlag)
|
|
PySys_WriteStderr("import %s # frozen%s\n",
|
|
name, ispackage ? " package" : "");
|
|
co = PyMarshal_ReadObjectFromString((char *)p->code, size);
|
|
if (co == NULL)
|
|
return -1;
|
|
if (!PyCode_Check(co)) {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"frozen object %.200s is not a code object",
|
|
name);
|
|
goto err_return;
|
|
}
|
|
if (ispackage) {
|
|
/* Set __path__ to the package name */
|
|
PyObject *d, *s;
|
|
int err;
|
|
m = PyImport_AddModule(name);
|
|
if (m == NULL)
|
|
goto err_return;
|
|
d = PyModule_GetDict(m);
|
|
s = PyString_InternFromString(name);
|
|
if (s == NULL)
|
|
goto err_return;
|
|
err = PyDict_SetItemString(d, "__path__", s);
|
|
Py_DECREF(s);
|
|
if (err != 0)
|
|
goto err_return;
|
|
}
|
|
m = PyImport_ExecCodeModuleEx(name, co, "<frozen>");
|
|
if (m == NULL)
|
|
goto err_return;
|
|
Py_DECREF(co);
|
|
Py_DECREF(m);
|
|
return 1;
|
|
err_return:
|
|
Py_DECREF(co);
|
|
return -1;
|
|
}
|
|
|
|
|
|
/* Import a module, either built-in, frozen, or external, and return
|
|
its module object WITH INCREMENTED REFERENCE COUNT */
|
|
|
|
PyObject *
|
|
PyImport_ImportModule(const char *name)
|
|
{
|
|
PyObject *pname;
|
|
PyObject *result;
|
|
|
|
pname = PyString_FromString(name);
|
|
if (pname == NULL)
|
|
return NULL;
|
|
result = PyImport_Import(pname);
|
|
Py_DECREF(pname);
|
|
return result;
|
|
}
|
|
|
|
/* Forward declarations for helper routines */
|
|
static PyObject *get_parent(PyObject *globals, char *buf,
|
|
Py_ssize_t *p_buflen, int level);
|
|
static PyObject *load_next(PyObject *mod, PyObject *altmod,
|
|
char **p_name, char *buf, Py_ssize_t *p_buflen);
|
|
static int mark_miss(char *name);
|
|
static int ensure_fromlist(PyObject *mod, PyObject *fromlist,
|
|
char *buf, Py_ssize_t buflen, int recursive);
|
|
static PyObject * import_submodule(PyObject *mod, char *name, char *fullname);
|
|
|
|
/* The Magnum Opus of dotted-name import :-) */
|
|
|
|
static PyObject *
|
|
import_module_level(char *name, PyObject *globals, PyObject *locals,
|
|
PyObject *fromlist, int level)
|
|
{
|
|
char buf[MAXPATHLEN+1];
|
|
Py_ssize_t buflen = 0;
|
|
PyObject *parent, *head, *next, *tail;
|
|
|
|
parent = get_parent(globals, buf, &buflen, level);
|
|
if (parent == NULL)
|
|
return NULL;
|
|
|
|
head = load_next(parent, Py_None, &name, buf, &buflen);
|
|
if (head == NULL)
|
|
return NULL;
|
|
|
|
tail = head;
|
|
Py_INCREF(tail);
|
|
while (name) {
|
|
next = load_next(tail, tail, &name, buf, &buflen);
|
|
Py_DECREF(tail);
|
|
if (next == NULL) {
|
|
Py_DECREF(head);
|
|
return NULL;
|
|
}
|
|
tail = next;
|
|
}
|
|
if (tail == Py_None) {
|
|
/* If tail is Py_None, both get_parent and load_next found
|
|
an empty module name: someone called __import__("") or
|
|
doctored faulty bytecode */
|
|
Py_DECREF(tail);
|
|
Py_DECREF(head);
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Empty module name");
|
|
return NULL;
|
|
}
|
|
|
|
if (fromlist != NULL) {
|
|
if (fromlist == Py_None || !PyObject_IsTrue(fromlist))
|
|
fromlist = NULL;
|
|
}
|
|
|
|
if (fromlist == NULL) {
|
|
Py_DECREF(tail);
|
|
return head;
|
|
}
|
|
|
|
Py_DECREF(head);
|
|
if (!ensure_fromlist(tail, fromlist, buf, buflen, 0)) {
|
|
Py_DECREF(tail);
|
|
return NULL;
|
|
}
|
|
|
|
return tail;
|
|
}
|
|
|
|
/* For DLL compatibility */
|
|
#undef PyImport_ImportModuleEx
|
|
PyObject *
|
|
PyImport_ImportModuleEx(char *name, PyObject *globals, PyObject *locals,
|
|
PyObject *fromlist)
|
|
{
|
|
PyObject *result;
|
|
lock_import();
|
|
result = import_module_level(name, globals, locals, fromlist, -1);
|
|
if (unlock_import() < 0) {
|
|
Py_XDECREF(result);
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"not holding the import lock");
|
|
return NULL;
|
|
}
|
|
return result;
|
|
}
|
|
#define PyImport_ImportModuleEx(n, g, l, f) \
|
|
PyImport_ImportModuleLevel(n, g, l, f, -1);
|
|
|
|
PyObject *
|
|
PyImport_ImportModuleLevel(char *name, PyObject *globals, PyObject *locals,
|
|
PyObject *fromlist, int level)
|
|
{
|
|
PyObject *result;
|
|
lock_import();
|
|
result = import_module_level(name, globals, locals, fromlist, level);
|
|
if (unlock_import() < 0) {
|
|
Py_XDECREF(result);
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"not holding the import lock");
|
|
return NULL;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/* Return the package that an import is being performed in. If globals comes
|
|
from the module foo.bar.bat (not itself a package), this returns the
|
|
sys.modules entry for foo.bar. If globals is from a package's __init__.py,
|
|
the package's entry in sys.modules is returned, as a borrowed reference.
|
|
|
|
The *name* of the returned package is returned in buf, with the length of
|
|
the name in *p_buflen.
|
|
|
|
If globals doesn't come from a package or a module in a package, or a
|
|
corresponding entry is not found in sys.modules, Py_None is returned.
|
|
*/
|
|
static PyObject *
|
|
get_parent(PyObject *globals, char *buf, Py_ssize_t *p_buflen, int level)
|
|
{
|
|
static PyObject *namestr = NULL;
|
|
static PyObject *pathstr = NULL;
|
|
PyObject *modname, *modpath, *modules, *parent;
|
|
|
|
if (globals == NULL || !PyDict_Check(globals) || !level)
|
|
return Py_None;
|
|
|
|
if (namestr == NULL) {
|
|
namestr = PyString_InternFromString("__name__");
|
|
if (namestr == NULL)
|
|
return NULL;
|
|
}
|
|
if (pathstr == NULL) {
|
|
pathstr = PyString_InternFromString("__path__");
|
|
if (pathstr == NULL)
|
|
return NULL;
|
|
}
|
|
|
|
*buf = '\0';
|
|
*p_buflen = 0;
|
|
modname = PyDict_GetItem(globals, namestr);
|
|
if (modname == NULL || !PyString_Check(modname))
|
|
return Py_None;
|
|
|
|
modpath = PyDict_GetItem(globals, pathstr);
|
|
if (modpath != NULL) {
|
|
Py_ssize_t len = PyString_GET_SIZE(modname);
|
|
if (len > MAXPATHLEN) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Module name too long");
|
|
return NULL;
|
|
}
|
|
strcpy(buf, PyString_AS_STRING(modname));
|
|
}
|
|
else {
|
|
char *start = PyString_AS_STRING(modname);
|
|
char *lastdot = strrchr(start, '.');
|
|
size_t len;
|
|
if (lastdot == NULL && level > 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Attempted relative import in non-package");
|
|
return NULL;
|
|
}
|
|
if (lastdot == NULL)
|
|
return Py_None;
|
|
len = lastdot - start;
|
|
if (len >= MAXPATHLEN) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Module name too long");
|
|
return NULL;
|
|
}
|
|
strncpy(buf, start, len);
|
|
buf[len] = '\0';
|
|
}
|
|
|
|
while (--level > 0) {
|
|
char *dot = strrchr(buf, '.');
|
|
if (dot == NULL) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Attempted relative import beyond "
|
|
"toplevel package");
|
|
return NULL;
|
|
}
|
|
*dot = '\0';
|
|
}
|
|
*p_buflen = strlen(buf);
|
|
|
|
modules = PyImport_GetModuleDict();
|
|
parent = PyDict_GetItemString(modules, buf);
|
|
if (parent == NULL)
|
|
PyErr_Format(PyExc_SystemError,
|
|
"Parent module '%.200s' not loaded", buf);
|
|
return parent;
|
|
/* We expect, but can't guarantee, if parent != None, that:
|
|
- parent.__name__ == buf
|
|
- parent.__dict__ is globals
|
|
If this is violated... Who cares? */
|
|
}
|
|
|
|
/* altmod is either None or same as mod */
|
|
static PyObject *
|
|
load_next(PyObject *mod, PyObject *altmod, char **p_name, char *buf,
|
|
Py_ssize_t *p_buflen)
|
|
{
|
|
char *name = *p_name;
|
|
char *dot = strchr(name, '.');
|
|
size_t len;
|
|
char *p;
|
|
PyObject *result;
|
|
|
|
if (strlen(name) == 0) {
|
|
/* completely empty module name should only happen in
|
|
'from . import' (or '__import__("")')*/
|
|
Py_INCREF(mod);
|
|
*p_name = NULL;
|
|
return mod;
|
|
}
|
|
|
|
if (dot == NULL) {
|
|
*p_name = NULL;
|
|
len = strlen(name);
|
|
}
|
|
else {
|
|
*p_name = dot+1;
|
|
len = dot-name;
|
|
}
|
|
if (len == 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Empty module name");
|
|
return NULL;
|
|
}
|
|
|
|
p = buf + *p_buflen;
|
|
if (p != buf)
|
|
*p++ = '.';
|
|
if (p+len-buf >= MAXPATHLEN) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Module name too long");
|
|
return NULL;
|
|
}
|
|
strncpy(p, name, len);
|
|
p[len] = '\0';
|
|
*p_buflen = p+len-buf;
|
|
|
|
result = import_submodule(mod, p, buf);
|
|
if (result == Py_None && altmod != mod) {
|
|
Py_DECREF(result);
|
|
/* Here, altmod must be None and mod must not be None */
|
|
result = import_submodule(altmod, p, p);
|
|
if (result != NULL && result != Py_None) {
|
|
if (mark_miss(buf) != 0) {
|
|
Py_DECREF(result);
|
|
return NULL;
|
|
}
|
|
strncpy(buf, name, len);
|
|
buf[len] = '\0';
|
|
*p_buflen = len;
|
|
}
|
|
}
|
|
if (result == NULL)
|
|
return NULL;
|
|
|
|
if (result == Py_None) {
|
|
Py_DECREF(result);
|
|
PyErr_Format(PyExc_ImportError,
|
|
"No module named %.200s", name);
|
|
return NULL;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
static int
|
|
mark_miss(char *name)
|
|
{
|
|
PyObject *modules = PyImport_GetModuleDict();
|
|
return PyDict_SetItemString(modules, name, Py_None);
|
|
}
|
|
|
|
static int
|
|
ensure_fromlist(PyObject *mod, PyObject *fromlist, char *buf, Py_ssize_t buflen,
|
|
int recursive)
|
|
{
|
|
int i;
|
|
|
|
if (!PyObject_HasAttrString(mod, "__path__"))
|
|
return 1;
|
|
|
|
for (i = 0; ; i++) {
|
|
PyObject *item = PySequence_GetItem(fromlist, i);
|
|
int hasit;
|
|
if (item == NULL) {
|
|
if (PyErr_ExceptionMatches(PyExc_IndexError)) {
|
|
PyErr_Clear();
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
if (!PyString_Check(item)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"Item in ``from list'' not a string");
|
|
Py_DECREF(item);
|
|
return 0;
|
|
}
|
|
if (PyString_AS_STRING(item)[0] == '*') {
|
|
PyObject *all;
|
|
Py_DECREF(item);
|
|
/* See if the package defines __all__ */
|
|
if (recursive)
|
|
continue; /* Avoid endless recursion */
|
|
all = PyObject_GetAttrString(mod, "__all__");
|
|
if (all == NULL)
|
|
PyErr_Clear();
|
|
else {
|
|
int ret = ensure_fromlist(mod, all, buf, buflen, 1);
|
|
Py_DECREF(all);
|
|
if (!ret)
|
|
return 0;
|
|
}
|
|
continue;
|
|
}
|
|
hasit = PyObject_HasAttr(mod, item);
|
|
if (!hasit) {
|
|
char *subname = PyString_AS_STRING(item);
|
|
PyObject *submod;
|
|
char *p;
|
|
if (buflen + strlen(subname) >= MAXPATHLEN) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Module name too long");
|
|
Py_DECREF(item);
|
|
return 0;
|
|
}
|
|
p = buf + buflen;
|
|
*p++ = '.';
|
|
strcpy(p, subname);
|
|
submod = import_submodule(mod, subname, buf);
|
|
Py_XDECREF(submod);
|
|
if (submod == NULL) {
|
|
Py_DECREF(item);
|
|
return 0;
|
|
}
|
|
}
|
|
Py_DECREF(item);
|
|
}
|
|
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
static int
|
|
add_submodule(PyObject *mod, PyObject *submod, char *fullname, char *subname,
|
|
PyObject *modules)
|
|
{
|
|
if (mod == Py_None)
|
|
return 1;
|
|
/* Irrespective of the success of this load, make a
|
|
reference to it in the parent package module. A copy gets
|
|
saved in the modules dictionary under the full name, so get a
|
|
reference from there, if need be. (The exception is when the
|
|
load failed with a SyntaxError -- then there's no trace in
|
|
sys.modules. In that case, of course, do nothing extra.) */
|
|
if (submod == NULL) {
|
|
submod = PyDict_GetItemString(modules, fullname);
|
|
if (submod == NULL)
|
|
return 1;
|
|
}
|
|
if (PyModule_Check(mod)) {
|
|
/* We can't use setattr here since it can give a
|
|
* spurious warning if the submodule name shadows a
|
|
* builtin name */
|
|
PyObject *dict = PyModule_GetDict(mod);
|
|
if (!dict)
|
|
return 0;
|
|
if (PyDict_SetItemString(dict, subname, submod) < 0)
|
|
return 0;
|
|
}
|
|
else {
|
|
if (PyObject_SetAttrString(mod, subname, submod) < 0)
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static PyObject *
|
|
import_submodule(PyObject *mod, char *subname, char *fullname)
|
|
{
|
|
PyObject *modules = PyImport_GetModuleDict();
|
|
PyObject *m = NULL;
|
|
|
|
/* Require:
|
|
if mod == None: subname == fullname
|
|
else: mod.__name__ + "." + subname == fullname
|
|
*/
|
|
|
|
if ((m = PyDict_GetItemString(modules, fullname)) != NULL) {
|
|
Py_INCREF(m);
|
|
}
|
|
else {
|
|
PyObject *path, *loader = NULL;
|
|
char buf[MAXPATHLEN+1];
|
|
struct filedescr *fdp;
|
|
FILE *fp = NULL;
|
|
|
|
if (mod == Py_None)
|
|
path = NULL;
|
|
else {
|
|
path = PyObject_GetAttrString(mod, "__path__");
|
|
if (path == NULL) {
|
|
PyErr_Clear();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
}
|
|
|
|
buf[0] = '\0';
|
|
fdp = find_module(fullname, subname, path, buf, MAXPATHLEN+1,
|
|
&fp, &loader);
|
|
Py_XDECREF(path);
|
|
if (fdp == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_ImportError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
m = load_module(fullname, fp, buf, fdp->type, loader);
|
|
Py_XDECREF(loader);
|
|
if (fp)
|
|
fclose(fp);
|
|
if (!add_submodule(mod, m, fullname, subname, modules)) {
|
|
Py_XDECREF(m);
|
|
m = NULL;
|
|
}
|
|
}
|
|
|
|
return m;
|
|
}
|
|
|
|
|
|
/* Re-import a module of any kind and return its module object, WITH
|
|
INCREMENTED REFERENCE COUNT */
|
|
|
|
PyObject *
|
|
PyImport_ReloadModule(PyObject *m)
|
|
{
|
|
PyInterpreterState *interp = PyThreadState_Get()->interp;
|
|
PyObject *modules_reloading = interp->modules_reloading;
|
|
PyObject *modules = PyImport_GetModuleDict();
|
|
PyObject *path = NULL, *loader = NULL, *existing_m = NULL;
|
|
char *name, *subname;
|
|
char buf[MAXPATHLEN+1];
|
|
struct filedescr *fdp;
|
|
FILE *fp = NULL;
|
|
PyObject *newm;
|
|
|
|
if (modules_reloading == NULL) {
|
|
Py_FatalError("PyImport_ReloadModule: "
|
|
"no modules_reloading dictionary!");
|
|
return NULL;
|
|
}
|
|
|
|
if (m == NULL || !PyModule_Check(m)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"reload() argument must be module");
|
|
return NULL;
|
|
}
|
|
name = PyModule_GetName(m);
|
|
if (name == NULL)
|
|
return NULL;
|
|
if (m != PyDict_GetItemString(modules, name)) {
|
|
PyErr_Format(PyExc_ImportError,
|
|
"reload(): module %.200s not in sys.modules",
|
|
name);
|
|
return NULL;
|
|
}
|
|
existing_m = PyDict_GetItemString(modules_reloading, name);
|
|
if (existing_m != NULL) {
|
|
/* Due to a recursive reload, this module is already
|
|
being reloaded. */
|
|
Py_INCREF(existing_m);
|
|
return existing_m;
|
|
}
|
|
if (PyDict_SetItemString(modules_reloading, name, m) < 0)
|
|
return NULL;
|
|
|
|
subname = strrchr(name, '.');
|
|
if (subname == NULL)
|
|
subname = name;
|
|
else {
|
|
PyObject *parentname, *parent;
|
|
parentname = PyString_FromStringAndSize(name, (subname-name));
|
|
if (parentname == NULL) {
|
|
imp_modules_reloading_clear();
|
|
return NULL;
|
|
}
|
|
parent = PyDict_GetItem(modules, parentname);
|
|
if (parent == NULL) {
|
|
PyErr_Format(PyExc_ImportError,
|
|
"reload(): parent %.200s not in sys.modules",
|
|
PyString_AS_STRING(parentname));
|
|
Py_DECREF(parentname);
|
|
imp_modules_reloading_clear();
|
|
return NULL;
|
|
}
|
|
Py_DECREF(parentname);
|
|
subname++;
|
|
path = PyObject_GetAttrString(parent, "__path__");
|
|
if (path == NULL)
|
|
PyErr_Clear();
|
|
}
|
|
buf[0] = '\0';
|
|
fdp = find_module(name, subname, path, buf, MAXPATHLEN+1, &fp, &loader);
|
|
Py_XDECREF(path);
|
|
|
|
if (fdp == NULL) {
|
|
Py_XDECREF(loader);
|
|
imp_modules_reloading_clear();
|
|
return NULL;
|
|
}
|
|
|
|
newm = load_module(name, fp, buf, fdp->type, loader);
|
|
Py_XDECREF(loader);
|
|
|
|
if (fp)
|
|
fclose(fp);
|
|
if (newm == NULL) {
|
|
/* load_module probably removed name from modules because of
|
|
* the error. Put back the original module object. We're
|
|
* going to return NULL in this case regardless of whether
|
|
* replacing name succeeds, so the return value is ignored.
|
|
*/
|
|
PyDict_SetItemString(modules, name, m);
|
|
}
|
|
imp_modules_reloading_clear();
|
|
return newm;
|
|
}
|
|
|
|
|
|
/* Higher-level import emulator which emulates the "import" statement
|
|
more accurately -- it invokes the __import__() function from the
|
|
builtins of the current globals. This means that the import is
|
|
done using whatever import hooks are installed in the current
|
|
environment, e.g. by "rexec".
|
|
A dummy list ["__doc__"] is passed as the 4th argument so that
|
|
e.g. PyImport_Import(PyString_FromString("win32com.client.gencache"))
|
|
will return <module "gencache"> instead of <module "win32com">. */
|
|
|
|
PyObject *
|
|
PyImport_Import(PyObject *module_name)
|
|
{
|
|
static PyObject *silly_list = NULL;
|
|
static PyObject *builtins_str = NULL;
|
|
static PyObject *import_str = NULL;
|
|
PyObject *globals = NULL;
|
|
PyObject *import = NULL;
|
|
PyObject *builtins = NULL;
|
|
PyObject *r = NULL;
|
|
|
|
/* Initialize constant string objects */
|
|
if (silly_list == NULL) {
|
|
import_str = PyString_InternFromString("__import__");
|
|
if (import_str == NULL)
|
|
return NULL;
|
|
builtins_str = PyString_InternFromString("__builtins__");
|
|
if (builtins_str == NULL)
|
|
return NULL;
|
|
silly_list = Py_BuildValue("[s]", "__doc__");
|
|
if (silly_list == NULL)
|
|
return NULL;
|
|
}
|
|
|
|
/* Get the builtins from current globals */
|
|
globals = PyEval_GetGlobals();
|
|
if (globals != NULL) {
|
|
Py_INCREF(globals);
|
|
builtins = PyObject_GetItem(globals, builtins_str);
|
|
if (builtins == NULL)
|
|
goto err;
|
|
}
|
|
else {
|
|
/* No globals -- use standard builtins, and fake globals */
|
|
PyErr_Clear();
|
|
|
|
builtins = PyImport_ImportModuleLevel("__builtin__",
|
|
NULL, NULL, NULL, 0);
|
|
if (builtins == NULL)
|
|
return NULL;
|
|
globals = Py_BuildValue("{OO}", builtins_str, builtins);
|
|
if (globals == NULL)
|
|
goto err;
|
|
}
|
|
|
|
/* Get the __import__ function from the builtins */
|
|
if (PyDict_Check(builtins)) {
|
|
import = PyObject_GetItem(builtins, import_str);
|
|
if (import == NULL)
|
|
PyErr_SetObject(PyExc_KeyError, import_str);
|
|
}
|
|
else
|
|
import = PyObject_GetAttr(builtins, import_str);
|
|
if (import == NULL)
|
|
goto err;
|
|
|
|
/* Call the __import__ function with the proper argument list */
|
|
r = PyObject_CallFunctionObjArgs(import, module_name, globals,
|
|
globals, silly_list, NULL);
|
|
|
|
err:
|
|
Py_XDECREF(globals);
|
|
Py_XDECREF(builtins);
|
|
Py_XDECREF(import);
|
|
|
|
return r;
|
|
}
|
|
|
|
|
|
/* Module 'imp' provides Python access to the primitives used for
|
|
importing modules.
|
|
*/
|
|
|
|
static PyObject *
|
|
imp_get_magic(PyObject *self, PyObject *noargs)
|
|
{
|
|
char buf[4];
|
|
|
|
buf[0] = (char) ((pyc_magic >> 0) & 0xff);
|
|
buf[1] = (char) ((pyc_magic >> 8) & 0xff);
|
|
buf[2] = (char) ((pyc_magic >> 16) & 0xff);
|
|
buf[3] = (char) ((pyc_magic >> 24) & 0xff);
|
|
|
|
return PyString_FromStringAndSize(buf, 4);
|
|
}
|
|
|
|
static PyObject *
|
|
imp_get_suffixes(PyObject *self, PyObject *noargs)
|
|
{
|
|
PyObject *list;
|
|
struct filedescr *fdp;
|
|
|
|
list = PyList_New(0);
|
|
if (list == NULL)
|
|
return NULL;
|
|
for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
|
|
PyObject *item = Py_BuildValue("ssi",
|
|
fdp->suffix, fdp->mode, fdp->type);
|
|
if (item == NULL) {
|
|
Py_DECREF(list);
|
|
return NULL;
|
|
}
|
|
if (PyList_Append(list, item) < 0) {
|
|
Py_DECREF(list);
|
|
Py_DECREF(item);
|
|
return NULL;
|
|
}
|
|
Py_DECREF(item);
|
|
}
|
|
return list;
|
|
}
|
|
|
|
static PyObject *
|
|
call_find_module(char *name, PyObject *path)
|
|
{
|
|
extern int fclose(FILE *);
|
|
PyObject *fob, *ret;
|
|
struct filedescr *fdp;
|
|
char pathname[MAXPATHLEN+1];
|
|
FILE *fp = NULL;
|
|
|
|
pathname[0] = '\0';
|
|
if (path == Py_None)
|
|
path = NULL;
|
|
fdp = find_module(NULL, name, path, pathname, MAXPATHLEN+1, &fp, NULL);
|
|
if (fdp == NULL)
|
|
return NULL;
|
|
if (fp != NULL) {
|
|
fob = PyFile_FromFile(fp, pathname, fdp->mode, fclose);
|
|
if (fob == NULL) {
|
|
fclose(fp);
|
|
return NULL;
|
|
}
|
|
}
|
|
else {
|
|
fob = Py_None;
|
|
Py_INCREF(fob);
|
|
}
|
|
ret = Py_BuildValue("Os(ssi)",
|
|
fob, pathname, fdp->suffix, fdp->mode, fdp->type);
|
|
Py_DECREF(fob);
|
|
return ret;
|
|
}
|
|
|
|
static PyObject *
|
|
imp_find_module(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
PyObject *path = NULL;
|
|
if (!PyArg_ParseTuple(args, "s|O:find_module", &name, &path))
|
|
return NULL;
|
|
return call_find_module(name, path);
|
|
}
|
|
|
|
static PyObject *
|
|
imp_init_builtin(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
int ret;
|
|
PyObject *m;
|
|
if (!PyArg_ParseTuple(args, "s:init_builtin", &name))
|
|
return NULL;
|
|
ret = init_builtin(name);
|
|
if (ret < 0)
|
|
return NULL;
|
|
if (ret == 0) {
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
m = PyImport_AddModule(name);
|
|
Py_XINCREF(m);
|
|
return m;
|
|
}
|
|
|
|
static PyObject *
|
|
imp_init_frozen(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
int ret;
|
|
PyObject *m;
|
|
if (!PyArg_ParseTuple(args, "s:init_frozen", &name))
|
|
return NULL;
|
|
ret = PyImport_ImportFrozenModule(name);
|
|
if (ret < 0)
|
|
return NULL;
|
|
if (ret == 0) {
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
m = PyImport_AddModule(name);
|
|
Py_XINCREF(m);
|
|
return m;
|
|
}
|
|
|
|
static PyObject *
|
|
imp_get_frozen_object(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:get_frozen_object", &name))
|
|
return NULL;
|
|
return get_frozen_object(name);
|
|
}
|
|
|
|
static PyObject *
|
|
imp_is_builtin(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
if (!PyArg_ParseTuple(args, "s:is_builtin", &name))
|
|
return NULL;
|
|
return PyInt_FromLong(is_builtin(name));
|
|
}
|
|
|
|
static PyObject *
|
|
imp_is_frozen(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
struct _frozen *p;
|
|
if (!PyArg_ParseTuple(args, "s:is_frozen", &name))
|
|
return NULL;
|
|
p = find_frozen(name);
|
|
return PyBool_FromLong((long) (p == NULL ? 0 : p->size));
|
|
}
|
|
|
|
static FILE *
|
|
get_file(char *pathname, PyObject *fob, char *mode)
|
|
{
|
|
FILE *fp;
|
|
if (fob == NULL) {
|
|
if (mode[0] == 'U')
|
|
mode = "r" PY_STDIOTEXTMODE;
|
|
fp = fopen(pathname, mode);
|
|
if (fp == NULL)
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
}
|
|
else {
|
|
fp = PyFile_AsFile(fob);
|
|
if (fp == NULL)
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"bad/closed file object");
|
|
}
|
|
return fp;
|
|
}
|
|
|
|
static PyObject *
|
|
imp_load_compiled(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
char *pathname;
|
|
PyObject *fob = NULL;
|
|
PyObject *m;
|
|
FILE *fp;
|
|
if (!PyArg_ParseTuple(args, "ss|O!:load_compiled", &name, &pathname,
|
|
&PyFile_Type, &fob))
|
|
return NULL;
|
|
fp = get_file(pathname, fob, "rb");
|
|
if (fp == NULL)
|
|
return NULL;
|
|
m = load_compiled_module(name, pathname, fp);
|
|
if (fob == NULL)
|
|
fclose(fp);
|
|
return m;
|
|
}
|
|
|
|
#ifdef HAVE_DYNAMIC_LOADING
|
|
|
|
static PyObject *
|
|
imp_load_dynamic(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
char *pathname;
|
|
PyObject *fob = NULL;
|
|
PyObject *m;
|
|
FILE *fp = NULL;
|
|
if (!PyArg_ParseTuple(args, "ss|O!:load_dynamic", &name, &pathname,
|
|
&PyFile_Type, &fob))
|
|
return NULL;
|
|
if (fob) {
|
|
fp = get_file(pathname, fob, "r");
|
|
if (fp == NULL)
|
|
return NULL;
|
|
}
|
|
m = _PyImport_LoadDynamicModule(name, pathname, fp);
|
|
return m;
|
|
}
|
|
|
|
#endif /* HAVE_DYNAMIC_LOADING */
|
|
|
|
static PyObject *
|
|
imp_load_source(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
char *pathname;
|
|
PyObject *fob = NULL;
|
|
PyObject *m;
|
|
FILE *fp;
|
|
if (!PyArg_ParseTuple(args, "ss|O!:load_source", &name, &pathname,
|
|
&PyFile_Type, &fob))
|
|
return NULL;
|
|
fp = get_file(pathname, fob, "r");
|
|
if (fp == NULL)
|
|
return NULL;
|
|
m = load_source_module(name, pathname, fp);
|
|
if (fob == NULL)
|
|
fclose(fp);
|
|
return m;
|
|
}
|
|
|
|
static PyObject *
|
|
imp_load_module(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
PyObject *fob;
|
|
char *pathname;
|
|
char *suffix; /* Unused */
|
|
char *mode;
|
|
int type;
|
|
FILE *fp;
|
|
|
|
if (!PyArg_ParseTuple(args, "sOs(ssi):load_module",
|
|
&name, &fob, &pathname,
|
|
&suffix, &mode, &type))
|
|
return NULL;
|
|
if (*mode) {
|
|
/* Mode must start with 'r' or 'U' and must not contain '+'.
|
|
Implicit in this test is the assumption that the mode
|
|
may contain other modifiers like 'b' or 't'. */
|
|
|
|
if (!(*mode == 'r' || *mode == 'U') || strchr(mode, '+')) {
|
|
PyErr_Format(PyExc_ValueError,
|
|
"invalid file open mode %.200s", mode);
|
|
return NULL;
|
|
}
|
|
}
|
|
if (fob == Py_None)
|
|
fp = NULL;
|
|
else {
|
|
if (!PyFile_Check(fob)) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"load_module arg#2 should be a file or None");
|
|
return NULL;
|
|
}
|
|
fp = get_file(pathname, fob, mode);
|
|
if (fp == NULL)
|
|
return NULL;
|
|
}
|
|
return load_module(name, fp, pathname, type, NULL);
|
|
}
|
|
|
|
static PyObject *
|
|
imp_load_package(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
char *pathname;
|
|
if (!PyArg_ParseTuple(args, "ss:load_package", &name, &pathname))
|
|
return NULL;
|
|
return load_package(name, pathname);
|
|
}
|
|
|
|
static PyObject *
|
|
imp_new_module(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
if (!PyArg_ParseTuple(args, "s:new_module", &name))
|
|
return NULL;
|
|
return PyModule_New(name);
|
|
}
|
|
|
|
/* Doc strings */
|
|
|
|
PyDoc_STRVAR(doc_imp,
|
|
"This module provides the components needed to build your own\n\
|
|
__import__ function. Undocumented functions are obsolete.");
|
|
|
|
PyDoc_STRVAR(doc_find_module,
|
|
"find_module(name, [path]) -> (file, filename, (suffix, mode, type))\n\
|
|
Search for a module. If path is omitted or None, search for a\n\
|
|
built-in, frozen or special module and continue search in sys.path.\n\
|
|
The module name cannot contain '.'; to search for a submodule of a\n\
|
|
package, pass the submodule name and the package's __path__.");
|
|
|
|
PyDoc_STRVAR(doc_load_module,
|
|
"load_module(name, file, filename, (suffix, mode, type)) -> module\n\
|
|
Load a module, given information returned by find_module().\n\
|
|
The module name must include the full package name, if any.");
|
|
|
|
PyDoc_STRVAR(doc_get_magic,
|
|
"get_magic() -> string\n\
|
|
Return the magic number for .pyc or .pyo files.");
|
|
|
|
PyDoc_STRVAR(doc_get_suffixes,
|
|
"get_suffixes() -> [(suffix, mode, type), ...]\n\
|
|
Return a list of (suffix, mode, type) tuples describing the files\n\
|
|
that find_module() looks for.");
|
|
|
|
PyDoc_STRVAR(doc_new_module,
|
|
"new_module(name) -> module\n\
|
|
Create a new module. Do not enter it in sys.modules.\n\
|
|
The module name must include the full package name, if any.");
|
|
|
|
PyDoc_STRVAR(doc_lock_held,
|
|
"lock_held() -> boolean\n\
|
|
Return True if the import lock is currently held, else False.\n\
|
|
On platforms without threads, return False.");
|
|
|
|
PyDoc_STRVAR(doc_acquire_lock,
|
|
"acquire_lock() -> None\n\
|
|
Acquires the interpreter's import lock for the current thread.\n\
|
|
This lock should be used by import hooks to ensure thread-safety\n\
|
|
when importing modules.\n\
|
|
On platforms without threads, this function does nothing.");
|
|
|
|
PyDoc_STRVAR(doc_release_lock,
|
|
"release_lock() -> None\n\
|
|
Release the interpreter's import lock.\n\
|
|
On platforms without threads, this function does nothing.");
|
|
|
|
static PyMethodDef imp_methods[] = {
|
|
{"find_module", imp_find_module, METH_VARARGS, doc_find_module},
|
|
{"get_magic", imp_get_magic, METH_NOARGS, doc_get_magic},
|
|
{"get_suffixes", imp_get_suffixes, METH_NOARGS, doc_get_suffixes},
|
|
{"load_module", imp_load_module, METH_VARARGS, doc_load_module},
|
|
{"new_module", imp_new_module, METH_VARARGS, doc_new_module},
|
|
{"lock_held", imp_lock_held, METH_NOARGS, doc_lock_held},
|
|
{"acquire_lock", imp_acquire_lock, METH_NOARGS, doc_acquire_lock},
|
|
{"release_lock", imp_release_lock, METH_NOARGS, doc_release_lock},
|
|
/* The rest are obsolete */
|
|
{"get_frozen_object", imp_get_frozen_object, METH_VARARGS},
|
|
{"init_builtin", imp_init_builtin, METH_VARARGS},
|
|
{"init_frozen", imp_init_frozen, METH_VARARGS},
|
|
{"is_builtin", imp_is_builtin, METH_VARARGS},
|
|
{"is_frozen", imp_is_frozen, METH_VARARGS},
|
|
{"load_compiled", imp_load_compiled, METH_VARARGS},
|
|
#ifdef HAVE_DYNAMIC_LOADING
|
|
{"load_dynamic", imp_load_dynamic, METH_VARARGS},
|
|
#endif
|
|
{"load_package", imp_load_package, METH_VARARGS},
|
|
{"load_source", imp_load_source, METH_VARARGS},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
static int
|
|
setint(PyObject *d, char *name, int value)
|
|
{
|
|
PyObject *v;
|
|
int err;
|
|
|
|
v = PyInt_FromLong((long)value);
|
|
err = PyDict_SetItemString(d, name, v);
|
|
Py_XDECREF(v);
|
|
return err;
|
|
}
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
} NullImporter;
|
|
|
|
static int
|
|
NullImporter_init(NullImporter *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
char *path;
|
|
|
|
if (!_PyArg_NoKeywords("NullImporter()", kwds))
|
|
return -1;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:NullImporter",
|
|
&path))
|
|
return -1;
|
|
|
|
if (strlen(path) == 0) {
|
|
PyErr_SetString(PyExc_ImportError, "empty pathname");
|
|
return -1;
|
|
} else {
|
|
#ifndef RISCOS
|
|
struct stat statbuf;
|
|
int rv;
|
|
|
|
rv = stat(path, &statbuf);
|
|
if (rv == 0) {
|
|
/* it exists */
|
|
if (S_ISDIR(statbuf.st_mode)) {
|
|
/* it's a directory */
|
|
PyErr_SetString(PyExc_ImportError,
|
|
"existing directory");
|
|
return -1;
|
|
}
|
|
}
|
|
#else
|
|
if (object_exists(path)) {
|
|
/* it exists */
|
|
if (isdir(path)) {
|
|
/* it's a directory */
|
|
PyErr_SetString(PyExc_ImportError,
|
|
"existing directory");
|
|
return -1;
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
NullImporter_find_module(NullImporter *self, PyObject *args)
|
|
{
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
static PyMethodDef NullImporter_methods[] = {
|
|
{"find_module", (PyCFunction)NullImporter_find_module, METH_VARARGS,
|
|
"Always return None"
|
|
},
|
|
{NULL} /* Sentinel */
|
|
};
|
|
|
|
|
|
static PyTypeObject NullImporterType = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /*ob_size*/
|
|
"imp.NullImporter", /*tp_name*/
|
|
sizeof(NullImporter), /*tp_basicsize*/
|
|
0, /*tp_itemsize*/
|
|
0, /*tp_dealloc*/
|
|
0, /*tp_print*/
|
|
0, /*tp_getattr*/
|
|
0, /*tp_setattr*/
|
|
0, /*tp_compare*/
|
|
0, /*tp_repr*/
|
|
0, /*tp_as_number*/
|
|
0, /*tp_as_sequence*/
|
|
0, /*tp_as_mapping*/
|
|
0, /*tp_hash */
|
|
0, /*tp_call*/
|
|
0, /*tp_str*/
|
|
0, /*tp_getattro*/
|
|
0, /*tp_setattro*/
|
|
0, /*tp_as_buffer*/
|
|
Py_TPFLAGS_DEFAULT, /*tp_flags*/
|
|
"Null importer object", /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
NullImporter_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 */
|
|
(initproc)NullImporter_init, /* tp_init */
|
|
0, /* tp_alloc */
|
|
PyType_GenericNew /* tp_new */
|
|
};
|
|
|
|
|
|
PyMODINIT_FUNC
|
|
initimp(void)
|
|
{
|
|
PyObject *m, *d;
|
|
|
|
if (PyType_Ready(&NullImporterType) < 0)
|
|
goto failure;
|
|
|
|
m = Py_InitModule4("imp", imp_methods, doc_imp,
|
|
NULL, PYTHON_API_VERSION);
|
|
if (m == NULL)
|
|
goto failure;
|
|
d = PyModule_GetDict(m);
|
|
if (d == NULL)
|
|
goto failure;
|
|
|
|
if (setint(d, "SEARCH_ERROR", SEARCH_ERROR) < 0) goto failure;
|
|
if (setint(d, "PY_SOURCE", PY_SOURCE) < 0) goto failure;
|
|
if (setint(d, "PY_COMPILED", PY_COMPILED) < 0) goto failure;
|
|
if (setint(d, "C_EXTENSION", C_EXTENSION) < 0) goto failure;
|
|
if (setint(d, "PY_RESOURCE", PY_RESOURCE) < 0) goto failure;
|
|
if (setint(d, "PKG_DIRECTORY", PKG_DIRECTORY) < 0) goto failure;
|
|
if (setint(d, "C_BUILTIN", C_BUILTIN) < 0) goto failure;
|
|
if (setint(d, "PY_FROZEN", PY_FROZEN) < 0) goto failure;
|
|
if (setint(d, "PY_CODERESOURCE", PY_CODERESOURCE) < 0) goto failure;
|
|
if (setint(d, "IMP_HOOK", IMP_HOOK) < 0) goto failure;
|
|
|
|
Py_INCREF(&NullImporterType);
|
|
PyModule_AddObject(m, "NullImporter", (PyObject *)&NullImporterType);
|
|
failure:
|
|
;
|
|
}
|
|
|
|
|
|
/* API for embedding applications that want to add their own entries
|
|
to the table of built-in modules. This should normally be called
|
|
*before* Py_Initialize(). When the table resize fails, -1 is
|
|
returned and the existing table is unchanged.
|
|
|
|
After a similar function by Just van Rossum. */
|
|
|
|
int
|
|
PyImport_ExtendInittab(struct _inittab *newtab)
|
|
{
|
|
static struct _inittab *our_copy = NULL;
|
|
struct _inittab *p;
|
|
int i, n;
|
|
|
|
/* Count the number of entries in both tables */
|
|
for (n = 0; newtab[n].name != NULL; n++)
|
|
;
|
|
if (n == 0)
|
|
return 0; /* Nothing to do */
|
|
for (i = 0; PyImport_Inittab[i].name != NULL; i++)
|
|
;
|
|
|
|
/* Allocate new memory for the combined table */
|
|
p = our_copy;
|
|
PyMem_RESIZE(p, struct _inittab, i+n+1);
|
|
if (p == NULL)
|
|
return -1;
|
|
|
|
/* Copy the tables into the new memory */
|
|
if (our_copy != PyImport_Inittab)
|
|
memcpy(p, PyImport_Inittab, (i+1) * sizeof(struct _inittab));
|
|
PyImport_Inittab = our_copy = p;
|
|
memcpy(p+i, newtab, (n+1) * sizeof(struct _inittab));
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Shorthand to add a single entry given a name and a function */
|
|
|
|
int
|
|
PyImport_AppendInittab(char *name, void (*initfunc)(void))
|
|
{
|
|
struct _inittab newtab[2];
|
|
|
|
memset(newtab, '\0', sizeof newtab);
|
|
|
|
newtab[0].name = name;
|
|
newtab[0].initfunc = initfunc;
|
|
|
|
return PyImport_ExtendInittab(newtab);
|
|
}
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|