1999-12-20 17:18:49 -04:00
|
|
|
|
|
|
|
/* Support for dynamic loading of extension modules */
|
|
|
|
|
Merged revisions 59703-59773 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59704 | christian.heimes | 2008-01-04 04:15:05 +0100 (Fri, 04 Jan 2008) | 1 line
Moved include "Python.h" in front of other imports to silence a warning.
........
r59706 | raymond.hettinger | 2008-01-04 04:22:53 +0100 (Fri, 04 Jan 2008) | 10 lines
Minor fix-ups to named tuples:
* Make the _replace() method respect subclassing.
* Using property() to make _fields read-only wasn't a good idea.
It caused len(Point._fields) to fail.
* Add note to _cast() about length checking and alternative with the star-operator.
........
r59707 | jeffrey.yasskin | 2008-01-04 09:01:23 +0100 (Fri, 04 Jan 2008) | 3 lines
Make math.{floor,ceil}({int,long}) return float again for backwards
compatibility after r59671 made them return integral types.
........
r59709 | christian.heimes | 2008-01-04 14:21:07 +0100 (Fri, 04 Jan 2008) | 1 line
Bug #1713: posixpath.ismount() claims symlink to a mountpoint is a mountpoint.
........
r59712 | lars.gustaebel | 2008-01-04 15:00:33 +0100 (Fri, 04 Jan 2008) | 5 lines
Issue #1735: TarFile.extractall() now correctly sets
directory permissions and times.
(will backport to 2.5)
........
r59714 | andrew.kuchling | 2008-01-04 15:47:17 +0100 (Fri, 04 Jan 2008) | 1 line
Update links to bug/patch tracker
........
r59716 | christian.heimes | 2008-01-04 16:23:30 +0100 (Fri, 04 Jan 2008) | 1 line
Added interface to Windows' WSAIoctl and a simple example for a network sniffer.
........
r59717 | christian.heimes | 2008-01-04 16:29:00 +0100 (Fri, 04 Jan 2008) | 1 line
And here is the rest of Hirokazu Yamamoto's patch for VS6.0 support. Thanks Hiro!
........
r59719 | christian.heimes | 2008-01-04 16:34:06 +0100 (Fri, 04 Jan 2008) | 1 line
Reverted last transaction. It's the wrong branch.
........
r59721 | christian.heimes | 2008-01-04 16:48:06 +0100 (Fri, 04 Jan 2008) | 1 line
socket.ioctl is only available on Windows
........
r59722 | andrew.kuchling | 2008-01-04 19:24:41 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59723 | andrew.kuchling | 2008-01-04 19:25:05 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59725 | guido.van.rossum | 2008-01-05 01:59:59 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1725 by Mark Dickinson, fixes incorrect conversion of -1e1000
and adds errors for -0x.
........
r59726 | guido.van.rossum | 2008-01-05 02:21:57 +0100 (Sat, 05 Jan 2008) | 2 lines
Patch #1698 by Senthil: allow '@' in username when parsed by urlparse.py.
........
r59727 | raymond.hettinger | 2008-01-05 02:35:43 +0100 (Sat, 05 Jan 2008) | 1 line
Improve namedtuple's _cast() method with a docstring, new name, and error-checking.
........
r59728 | raymond.hettinger | 2008-01-05 03:17:24 +0100 (Sat, 05 Jan 2008) | 1 line
Add error-checking to namedtuple's _replace() method.
........
r59730 | fred.drake | 2008-01-05 05:38:38 +0100 (Sat, 05 Jan 2008) | 2 lines
clean up a comment
........
r59731 | jeffrey.yasskin | 2008-01-05 09:47:13 +0100 (Sat, 05 Jan 2008) | 11 lines
Continue rolling back pep-3141 changes that changed behavior from 2.5. This
round included:
* Revert round to its 2.6 behavior (half away from 0).
* Because round, floor, and ceil always return float again, it's no
longer necessary to have them delegate to __xxx___, so I've ripped
that out of their implementations and the Real ABC. This also helps
in implementing types that work in both 2.6 and 3.0: you return int
from the __xxx__ methods, and let it get enabled by the version
upgrade.
* Make pow(-1, .5) raise a ValueError again.
........
r59736 | andrew.kuchling | 2008-01-05 16:13:49 +0100 (Sat, 05 Jan 2008) | 1 line
Fix comment typo
........
r59738 | thomas.heller | 2008-01-05 18:15:44 +0100 (Sat, 05 Jan 2008) | 1 line
Add myself.
........
r59739 | georg.brandl | 2008-01-05 18:49:17 +0100 (Sat, 05 Jan 2008) | 2 lines
Fix C++-style comment.
........
r59742 | georg.brandl | 2008-01-05 20:28:16 +0100 (Sat, 05 Jan 2008) | 2 lines
Remove with_statement future imports from 2.6 docs.
........
r59743 | georg.brandl | 2008-01-05 20:29:45 +0100 (Sat, 05 Jan 2008) | 2 lines
Simplify index entries; fix #1712.
........
r59744 | georg.brandl | 2008-01-05 20:44:22 +0100 (Sat, 05 Jan 2008) | 2 lines
Doc patch #1730 from Robin Stocker; minor corrections mostly to os.rst.
........
r59749 | georg.brandl | 2008-01-05 21:29:13 +0100 (Sat, 05 Jan 2008) | 2 lines
Revert socket.rst to unix-eol.
........
r59750 | georg.brandl | 2008-01-05 21:33:46 +0100 (Sat, 05 Jan 2008) | 2 lines
Set native svn:eol-style property for text files.
........
r59752 | georg.brandl | 2008-01-05 21:46:29 +0100 (Sat, 05 Jan 2008) | 2 lines
#1719: capitalization error in "UuidCreate".
........
r59753 | georg.brandl | 2008-01-05 22:02:25 +0100 (Sat, 05 Jan 2008) | 2 lines
Repair markup.
........
r59754 | georg.brandl | 2008-01-05 22:10:50 +0100 (Sat, 05 Jan 2008) | 2 lines
Use markup.
........
r59757 | christian.heimes | 2008-01-05 22:35:52 +0100 (Sat, 05 Jan 2008) | 1 line
Final adjustments for #1601
........
r59758 | guido.van.rossum | 2008-01-05 23:19:06 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1637: fix urlparse for URLs like 'http://x.com?arg=/foo'.
Fix by John Nagle.
........
r59759 | guido.van.rossum | 2008-01-05 23:20:01 +0100 (Sat, 05 Jan 2008) | 2 lines
Add John Nagle (of issue #1637).
........
r59765 | raymond.hettinger | 2008-01-06 10:02:24 +0100 (Sun, 06 Jan 2008) | 1 line
Small code simplification. Forgot that classmethods can be called from intances.
........
r59766 | martin.v.loewis | 2008-01-06 11:09:48 +0100 (Sun, 06 Jan 2008) | 2 lines
Use vcbuild for VS 2009.
........
r59767 | martin.v.loewis | 2008-01-06 12:03:43 +0100 (Sun, 06 Jan 2008) | 2 lines
Package using VS 2008.
........
r59768 | martin.v.loewis | 2008-01-06 12:13:16 +0100 (Sun, 06 Jan 2008) | 2 lines
Don't try to package msvcr90 for the moment.
........
r59769 | georg.brandl | 2008-01-06 15:17:36 +0100 (Sun, 06 Jan 2008) | 4 lines
#1696393: don't check for '.' and '..' in ntpath.walk since
they aren't returned from os.listdir anymore.
Reported by Michael Haggerty.
........
r59770 | georg.brandl | 2008-01-06 15:27:15 +0100 (Sun, 06 Jan 2008) | 3 lines
#1742: don't raise exception on os.path.relpath("a", "a"), but return os.curdir.
Reported by Jesse Towner.
........
r59771 | georg.brandl | 2008-01-06 15:33:52 +0100 (Sun, 06 Jan 2008) | 2 lines
#1591: Clarify docstring of Popen3.
........
r59772 | georg.brandl | 2008-01-06 16:30:34 +0100 (Sun, 06 Jan 2008) | 2 lines
#1680: fix context manager example function name.
........
r59773 | georg.brandl | 2008-01-06 16:34:57 +0100 (Sun, 06 Jan 2008) | 2 lines
#1755097: document default values for [].sort() and sorted().
........
2008-01-06 12:59:19 -04:00
|
|
|
#include "Python.h"
|
2021-12-02 20:08:42 -04:00
|
|
|
#include "pycore_fileutils.h" // _Py_add_relfile()
|
|
|
|
#include "pycore_pystate.h" // _PyInterpreterState_GET()
|
Merged revisions 59703-59773 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59704 | christian.heimes | 2008-01-04 04:15:05 +0100 (Fri, 04 Jan 2008) | 1 line
Moved include "Python.h" in front of other imports to silence a warning.
........
r59706 | raymond.hettinger | 2008-01-04 04:22:53 +0100 (Fri, 04 Jan 2008) | 10 lines
Minor fix-ups to named tuples:
* Make the _replace() method respect subclassing.
* Using property() to make _fields read-only wasn't a good idea.
It caused len(Point._fields) to fail.
* Add note to _cast() about length checking and alternative with the star-operator.
........
r59707 | jeffrey.yasskin | 2008-01-04 09:01:23 +0100 (Fri, 04 Jan 2008) | 3 lines
Make math.{floor,ceil}({int,long}) return float again for backwards
compatibility after r59671 made them return integral types.
........
r59709 | christian.heimes | 2008-01-04 14:21:07 +0100 (Fri, 04 Jan 2008) | 1 line
Bug #1713: posixpath.ismount() claims symlink to a mountpoint is a mountpoint.
........
r59712 | lars.gustaebel | 2008-01-04 15:00:33 +0100 (Fri, 04 Jan 2008) | 5 lines
Issue #1735: TarFile.extractall() now correctly sets
directory permissions and times.
(will backport to 2.5)
........
r59714 | andrew.kuchling | 2008-01-04 15:47:17 +0100 (Fri, 04 Jan 2008) | 1 line
Update links to bug/patch tracker
........
r59716 | christian.heimes | 2008-01-04 16:23:30 +0100 (Fri, 04 Jan 2008) | 1 line
Added interface to Windows' WSAIoctl and a simple example for a network sniffer.
........
r59717 | christian.heimes | 2008-01-04 16:29:00 +0100 (Fri, 04 Jan 2008) | 1 line
And here is the rest of Hirokazu Yamamoto's patch for VS6.0 support. Thanks Hiro!
........
r59719 | christian.heimes | 2008-01-04 16:34:06 +0100 (Fri, 04 Jan 2008) | 1 line
Reverted last transaction. It's the wrong branch.
........
r59721 | christian.heimes | 2008-01-04 16:48:06 +0100 (Fri, 04 Jan 2008) | 1 line
socket.ioctl is only available on Windows
........
r59722 | andrew.kuchling | 2008-01-04 19:24:41 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59723 | andrew.kuchling | 2008-01-04 19:25:05 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59725 | guido.van.rossum | 2008-01-05 01:59:59 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1725 by Mark Dickinson, fixes incorrect conversion of -1e1000
and adds errors for -0x.
........
r59726 | guido.van.rossum | 2008-01-05 02:21:57 +0100 (Sat, 05 Jan 2008) | 2 lines
Patch #1698 by Senthil: allow '@' in username when parsed by urlparse.py.
........
r59727 | raymond.hettinger | 2008-01-05 02:35:43 +0100 (Sat, 05 Jan 2008) | 1 line
Improve namedtuple's _cast() method with a docstring, new name, and error-checking.
........
r59728 | raymond.hettinger | 2008-01-05 03:17:24 +0100 (Sat, 05 Jan 2008) | 1 line
Add error-checking to namedtuple's _replace() method.
........
r59730 | fred.drake | 2008-01-05 05:38:38 +0100 (Sat, 05 Jan 2008) | 2 lines
clean up a comment
........
r59731 | jeffrey.yasskin | 2008-01-05 09:47:13 +0100 (Sat, 05 Jan 2008) | 11 lines
Continue rolling back pep-3141 changes that changed behavior from 2.5. This
round included:
* Revert round to its 2.6 behavior (half away from 0).
* Because round, floor, and ceil always return float again, it's no
longer necessary to have them delegate to __xxx___, so I've ripped
that out of their implementations and the Real ABC. This also helps
in implementing types that work in both 2.6 and 3.0: you return int
from the __xxx__ methods, and let it get enabled by the version
upgrade.
* Make pow(-1, .5) raise a ValueError again.
........
r59736 | andrew.kuchling | 2008-01-05 16:13:49 +0100 (Sat, 05 Jan 2008) | 1 line
Fix comment typo
........
r59738 | thomas.heller | 2008-01-05 18:15:44 +0100 (Sat, 05 Jan 2008) | 1 line
Add myself.
........
r59739 | georg.brandl | 2008-01-05 18:49:17 +0100 (Sat, 05 Jan 2008) | 2 lines
Fix C++-style comment.
........
r59742 | georg.brandl | 2008-01-05 20:28:16 +0100 (Sat, 05 Jan 2008) | 2 lines
Remove with_statement future imports from 2.6 docs.
........
r59743 | georg.brandl | 2008-01-05 20:29:45 +0100 (Sat, 05 Jan 2008) | 2 lines
Simplify index entries; fix #1712.
........
r59744 | georg.brandl | 2008-01-05 20:44:22 +0100 (Sat, 05 Jan 2008) | 2 lines
Doc patch #1730 from Robin Stocker; minor corrections mostly to os.rst.
........
r59749 | georg.brandl | 2008-01-05 21:29:13 +0100 (Sat, 05 Jan 2008) | 2 lines
Revert socket.rst to unix-eol.
........
r59750 | georg.brandl | 2008-01-05 21:33:46 +0100 (Sat, 05 Jan 2008) | 2 lines
Set native svn:eol-style property for text files.
........
r59752 | georg.brandl | 2008-01-05 21:46:29 +0100 (Sat, 05 Jan 2008) | 2 lines
#1719: capitalization error in "UuidCreate".
........
r59753 | georg.brandl | 2008-01-05 22:02:25 +0100 (Sat, 05 Jan 2008) | 2 lines
Repair markup.
........
r59754 | georg.brandl | 2008-01-05 22:10:50 +0100 (Sat, 05 Jan 2008) | 2 lines
Use markup.
........
r59757 | christian.heimes | 2008-01-05 22:35:52 +0100 (Sat, 05 Jan 2008) | 1 line
Final adjustments for #1601
........
r59758 | guido.van.rossum | 2008-01-05 23:19:06 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1637: fix urlparse for URLs like 'http://x.com?arg=/foo'.
Fix by John Nagle.
........
r59759 | guido.van.rossum | 2008-01-05 23:20:01 +0100 (Sat, 05 Jan 2008) | 2 lines
Add John Nagle (of issue #1637).
........
r59765 | raymond.hettinger | 2008-01-06 10:02:24 +0100 (Sun, 06 Jan 2008) | 1 line
Small code simplification. Forgot that classmethods can be called from intances.
........
r59766 | martin.v.loewis | 2008-01-06 11:09:48 +0100 (Sun, 06 Jan 2008) | 2 lines
Use vcbuild for VS 2009.
........
r59767 | martin.v.loewis | 2008-01-06 12:03:43 +0100 (Sun, 06 Jan 2008) | 2 lines
Package using VS 2008.
........
r59768 | martin.v.loewis | 2008-01-06 12:13:16 +0100 (Sun, 06 Jan 2008) | 2 lines
Don't try to package msvcr90 for the moment.
........
r59769 | georg.brandl | 2008-01-06 15:17:36 +0100 (Sun, 06 Jan 2008) | 4 lines
#1696393: don't check for '.' and '..' in ntpath.walk since
they aren't returned from os.listdir anymore.
Reported by Michael Haggerty.
........
r59770 | georg.brandl | 2008-01-06 15:27:15 +0100 (Sun, 06 Jan 2008) | 3 lines
#1742: don't raise exception on os.path.relpath("a", "a"), but return os.curdir.
Reported by Jesse Towner.
........
r59771 | georg.brandl | 2008-01-06 15:33:52 +0100 (Sun, 06 Jan 2008) | 2 lines
#1591: Clarify docstring of Popen3.
........
r59772 | georg.brandl | 2008-01-06 16:30:34 +0100 (Sun, 06 Jan 2008) | 2 lines
#1680: fix context manager example function name.
........
r59773 | georg.brandl | 2008-01-06 16:34:57 +0100 (Sun, 06 Jan 2008) | 2 lines
#1755097: document default values for [].sort() and sorted().
........
2008-01-06 12:59:19 -04:00
|
|
|
|
2023-09-03 13:54:27 -03:00
|
|
|
#include "importdl.h" // dl_funcptr
|
|
|
|
#include "patchlevel.h" // PY_MAJOR_VERSION
|
Merged revisions 55631-55794 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55636 | neal.norwitz | 2007-05-29 00:06:39 -0700 (Tue, 29 May 2007) | 149 lines
Merged revisions 55506-55635 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55507 | georg.brandl | 2007-05-22 07:28:17 -0700 (Tue, 22 May 2007) | 2 lines
Remove the "panel" module doc file which has been ignored since 1994.
........
r55522 | mark.hammond | 2007-05-22 19:04:28 -0700 (Tue, 22 May 2007) | 4 lines
Remove definition of PY_UNICODE_TYPE from pyconfig.h, allowing the
definition in unicodeobject.h to be used, giving us the desired
wchar_t in place of 'unsigned short'. As discussed on python-dev.
........
r55525 | neal.norwitz | 2007-05-22 23:35:32 -0700 (Tue, 22 May 2007) | 6 lines
Add -3 option to the interpreter to warn about features that are
deprecated and will be changed/removed in Python 3.0.
This patch is mostly from Anthony. I tweaked some format and added
a little doc.
........
r55527 | neal.norwitz | 2007-05-22 23:57:35 -0700 (Tue, 22 May 2007) | 1 line
Whitespace cleanup
........
r55528 | neal.norwitz | 2007-05-22 23:58:36 -0700 (Tue, 22 May 2007) | 1 line
Add a bunch more deprecation warnings for builtins that are going away in 3.0
........
r55549 | georg.brandl | 2007-05-24 09:49:29 -0700 (Thu, 24 May 2007) | 2 lines
shlex.split() now has an optional "posix" parameter.
........
r55550 | georg.brandl | 2007-05-24 10:33:33 -0700 (Thu, 24 May 2007) | 2 lines
Fix parameter passing.
........
r55555 | facundo.batista | 2007-05-24 10:50:54 -0700 (Thu, 24 May 2007) | 6 lines
Added an optional timeout parameter to urllib.ftpwrapper, with tests
(for this and a basic one, because there weren't any). Changed also
NEWS, but didn't find documentation for this function, assumed it
wasn't public...
........
r55563 | facundo.batista | 2007-05-24 13:01:59 -0700 (Thu, 24 May 2007) | 4 lines
Removed the .recv() in the test, is not necessary, and was
causing problems that didn't have anything to do with was
actually being tested...
........
r55564 | facundo.batista | 2007-05-24 13:51:19 -0700 (Thu, 24 May 2007) | 5 lines
Let's see if reading exactly what is written allow this live
test to pass (now I know why there were so few tests in ftp,
http, etc, :( ).
........
r55567 | facundo.batista | 2007-05-24 20:10:28 -0700 (Thu, 24 May 2007) | 4 lines
Trying to make the tests work in Windows and Solaris, everywhere
else just works
........
r55568 | facundo.batista | 2007-05-24 20:47:19 -0700 (Thu, 24 May 2007) | 4 lines
Fixing stupid error, and introducing a sleep, to see if the
other thread is awakened and finish sending data.
........
r55569 | facundo.batista | 2007-05-24 21:20:22 -0700 (Thu, 24 May 2007) | 4 lines
Commenting out the tests until find out who can test them in
one of the problematic enviroments.
........
r55570 | neal.norwitz | 2007-05-24 22:13:40 -0700 (Thu, 24 May 2007) | 2 lines
Get test passing again by commenting out the reference to the test class.
........
r55575 | vinay.sajip | 2007-05-25 00:05:59 -0700 (Fri, 25 May 2007) | 1 line
Updated docstring for SysLogHandler (#1720726).
........
r55576 | vinay.sajip | 2007-05-25 00:06:55 -0700 (Fri, 25 May 2007) | 1 line
Updated documentation for SysLogHandler (#1720726).
........
r55592 | brett.cannon | 2007-05-25 13:17:15 -0700 (Fri, 25 May 2007) | 3 lines
Remove direct call's to file's constructor and replace them with calls to
open() as ths is considered best practice.
........
r55601 | kristjan.jonsson | 2007-05-26 12:19:50 -0700 (Sat, 26 May 2007) | 1 line
Remove the rgbimgmodule from PCBuild8
........
r55602 | kristjan.jonsson | 2007-05-26 12:31:39 -0700 (Sat, 26 May 2007) | 1 line
Include <windows.h> after python.h, so that WINNT is properly set before windows.h is included. Fixes warnings in PC builds.
........
r55603 | walter.doerwald | 2007-05-26 14:04:13 -0700 (Sat, 26 May 2007) | 2 lines
Fix typo.
........
r55604 | peter.astrand | 2007-05-26 15:18:20 -0700 (Sat, 26 May 2007) | 1 line
Applied patch 1669481, slightly modified: Support close_fds on Win32
........
r55606 | neal.norwitz | 2007-05-26 21:08:54 -0700 (Sat, 26 May 2007) | 2 lines
Add the new function object attribute names from py3k.
........
r55617 | lars.gustaebel | 2007-05-27 12:49:30 -0700 (Sun, 27 May 2007) | 20 lines
Added errors argument to TarFile class that allows the user to
specify an error handling scheme for character conversion. Additional
scheme "utf-8" in read mode. Unicode input filenames are now
supported by design. The values of the pax_headers dictionary are now
limited to unicode objects.
Fixed: The prefix field is no longer used in PAX_FORMAT (in
conformance with POSIX).
Fixed: In read mode use a possible pax header size field.
Fixed: Strip trailing slashes from pax header name values.
Fixed: Give values in user-specified pax_headers precedence when
writing.
Added unicode tests. Added pax/regtype4 member to testtar.tar all
possible number fields in a pax header.
Added two chapters to the documentation about the different formats
tarfile.py supports and how unicode issues are handled.
........
r55618 | raymond.hettinger | 2007-05-27 22:23:22 -0700 (Sun, 27 May 2007) | 1 line
Explain when groupby() issues a new group.
........
r55634 | martin.v.loewis | 2007-05-28 21:01:29 -0700 (Mon, 28 May 2007) | 2 lines
Test pre-commit hook for a link to a .py file.
........
r55635 | martin.v.loewis | 2007-05-28 21:02:03 -0700 (Mon, 28 May 2007) | 2 lines
Revert 55634.
........
................
r55639 | neal.norwitz | 2007-05-29 00:58:11 -0700 (Tue, 29 May 2007) | 1 line
Remove sys.exc_{type,exc_value,exc_traceback}
................
r55641 | neal.norwitz | 2007-05-29 01:03:50 -0700 (Tue, 29 May 2007) | 1 line
Missed one sys.exc_type. I wonder why exc_{value,traceback} were already gone
................
r55642 | neal.norwitz | 2007-05-29 01:08:33 -0700 (Tue, 29 May 2007) | 1 line
Missed more doc for sys.exc_* attrs.
................
r55643 | neal.norwitz | 2007-05-29 01:18:19 -0700 (Tue, 29 May 2007) | 1 line
Remove sys.exc_clear()
................
r55665 | guido.van.rossum | 2007-05-29 19:45:43 -0700 (Tue, 29 May 2007) | 4 lines
Make None, True, False keywords.
We can now also delete all the other places that explicitly forbid
assignment to None, but I'm not going to bother right now.
................
r55666 | guido.van.rossum | 2007-05-29 20:01:51 -0700 (Tue, 29 May 2007) | 3 lines
Found another place that needs check for forbidden names.
Fixed test_syntax.py accordingly (it helped me find that one).
................
r55668 | guido.van.rossum | 2007-05-29 20:41:48 -0700 (Tue, 29 May 2007) | 2 lines
Mark None, True, False as keywords.
................
r55673 | neal.norwitz | 2007-05-29 23:28:25 -0700 (Tue, 29 May 2007) | 3 lines
Get the dis module working on modules again after changing dicts
to not return lists and also new-style classes. Add a test.
................
r55674 | neal.norwitz | 2007-05-29 23:35:45 -0700 (Tue, 29 May 2007) | 1 line
Umm, it helps to add the module that the test uses
................
r55675 | neal.norwitz | 2007-05-29 23:53:05 -0700 (Tue, 29 May 2007) | 4 lines
Try to fix up all the other places that were assigning to True/False.
There's at least one more problem in test.test_xmlrpc. I have other
changes in that file and that should be fixed soon (I hope).
................
r55679 | neal.norwitz | 2007-05-30 00:31:55 -0700 (Wed, 30 May 2007) | 1 line
Fix up another place that was assigning to True/False.
................
r55688 | brett.cannon | 2007-05-30 14:19:47 -0700 (Wed, 30 May 2007) | 2 lines
Ditch MimeWriter.
................
r55692 | brett.cannon | 2007-05-30 14:52:00 -0700 (Wed, 30 May 2007) | 2 lines
Remove the mimify module.
................
r55707 | guido.van.rossum | 2007-05-31 05:08:45 -0700 (Thu, 31 May 2007) | 2 lines
Backport the addition of show_code() to dis.py -- it's too handy.
................
r55708 | guido.van.rossum | 2007-05-31 06:22:57 -0700 (Thu, 31 May 2007) | 7 lines
Fix a fairly long-standing bug in the check for assignment to None (and other
keywords, these days). In 2.5, you could write foo(None=1) without getting
a SyntaxError (although foo()'s definition would have to use **kwds to avoid
getting a runtime error complaining about an unknown keyword of course).
This ought to be backported to 2.5.2 or at least 2.6.
................
r55724 | brett.cannon | 2007-05-31 19:32:41 -0700 (Thu, 31 May 2007) | 2 lines
Remove the cfmfile.
................
r55727 | neal.norwitz | 2007-05-31 22:19:44 -0700 (Thu, 31 May 2007) | 1 line
Remove reload() builtin.
................
r55729 | neal.norwitz | 2007-05-31 22:51:30 -0700 (Thu, 31 May 2007) | 59 lines
Merged revisions 55636-55728 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55637 | georg.brandl | 2007-05-29 00:16:47 -0700 (Tue, 29 May 2007) | 2 lines
Fix rst markup.
........
r55638 | neal.norwitz | 2007-05-29 00:51:39 -0700 (Tue, 29 May 2007) | 1 line
Fix typo in doc
........
r55671 | neal.norwitz | 2007-05-29 21:53:41 -0700 (Tue, 29 May 2007) | 1 line
Fix indentation (whitespace only).
........
r55676 | thomas.heller | 2007-05-29 23:58:30 -0700 (Tue, 29 May 2007) | 1 line
Fix compiler warnings.
........
r55677 | thomas.heller | 2007-05-30 00:01:25 -0700 (Wed, 30 May 2007) | 2 lines
Correct the name of a field in the WIN32_FIND_DATAA and WIN32_FIND_DATAW structures.
Closes bug #1726026.
........
r55686 | brett.cannon | 2007-05-30 13:46:26 -0700 (Wed, 30 May 2007) | 2 lines
Have MimeWriter raise a DeprecationWarning as per PEP 4 and its documentation.
........
r55690 | brett.cannon | 2007-05-30 14:48:58 -0700 (Wed, 30 May 2007) | 3 lines
Have mimify raise a DeprecationWarning. The docs and PEP 4 have listed the
module as deprecated for a while.
........
r55696 | brett.cannon | 2007-05-30 15:24:28 -0700 (Wed, 30 May 2007) | 2 lines
Have md5 raise a DeprecationWarning as per PEP 4.
........
r55705 | neal.norwitz | 2007-05-30 21:14:22 -0700 (Wed, 30 May 2007) | 1 line
Add some spaces in the example code.
........
r55716 | brett.cannon | 2007-05-31 12:20:00 -0700 (Thu, 31 May 2007) | 2 lines
Have the sha module raise a DeprecationWarning as specified in PEP 4.
........
r55719 | brett.cannon | 2007-05-31 12:40:42 -0700 (Thu, 31 May 2007) | 2 lines
Cause buildtools to raise a DeprecationWarning.
........
r55721 | brett.cannon | 2007-05-31 13:01:11 -0700 (Thu, 31 May 2007) | 2 lines
Have cfmfile raise a DeprecationWarning as per PEP 4.
........
r55726 | neal.norwitz | 2007-05-31 21:56:47 -0700 (Thu, 31 May 2007) | 1 line
Mail if there is an installation failure.
........
................
r55730 | neal.norwitz | 2007-05-31 23:22:07 -0700 (Thu, 31 May 2007) | 2 lines
Remove the code that was missed in rev 55303.
................
r55738 | neal.norwitz | 2007-06-01 19:10:43 -0700 (Fri, 01 Jun 2007) | 1 line
Fix doc breakage
................
r55741 | neal.norwitz | 2007-06-02 00:41:58 -0700 (Sat, 02 Jun 2007) | 1 line
Remove timing module (plus some remnants of other modules).
................
r55742 | neal.norwitz | 2007-06-02 00:51:44 -0700 (Sat, 02 Jun 2007) | 1 line
Remove posixfile module (plus some remnants of other modules).
................
r55744 | neal.norwitz | 2007-06-02 10:18:56 -0700 (Sat, 02 Jun 2007) | 1 line
Fix doc breakage.
................
r55745 | neal.norwitz | 2007-06-02 11:32:16 -0700 (Sat, 02 Jun 2007) | 1 line
Make a whatsnew 3.0 template.
................
r55754 | neal.norwitz | 2007-06-03 23:24:18 -0700 (Sun, 03 Jun 2007) | 1 line
SF #1730441, os._execvpe raises UnboundLocal due to new try/except semantics
................
r55755 | neal.norwitz | 2007-06-03 23:26:00 -0700 (Sun, 03 Jun 2007) | 1 line
Get rid of extra whitespace
................
r55794 | guido.van.rossum | 2007-06-06 15:29:22 -0700 (Wed, 06 Jun 2007) | 3 lines
Make this compile in GCC 2.96, which does not allow interspersing
declarations and code.
................
2007-06-06 20:52:48 -03:00
|
|
|
#include <windows.h>
|
1999-12-20 17:18:49 -04:00
|
|
|
|
|
|
|
#ifdef _DEBUG
|
2014-12-16 00:45:23 -04:00
|
|
|
#define PYD_DEBUG_SUFFIX "_d"
|
|
|
|
#else
|
|
|
|
#define PYD_DEBUG_SUFFIX ""
|
|
|
|
#endif
|
|
|
|
|
2023-09-27 12:24:12 -03:00
|
|
|
#ifdef Py_NOGIL
|
|
|
|
# define PYD_THREADING_TAG "t"
|
|
|
|
#else
|
|
|
|
# define PYD_THREADING_TAG ""
|
|
|
|
#endif
|
|
|
|
|
2014-12-16 00:45:23 -04:00
|
|
|
#ifdef PYD_PLATFORM_TAG
|
2023-09-27 12:24:12 -03:00
|
|
|
#define PYD_TAGGED_SUFFIX PYD_DEBUG_SUFFIX ".cp" Py_STRINGIFY(PY_MAJOR_VERSION) Py_STRINGIFY(PY_MINOR_VERSION) PYD_THREADING_TAG "-" PYD_PLATFORM_TAG ".pyd"
|
1999-12-20 17:18:49 -04:00
|
|
|
#else
|
2023-09-27 12:24:12 -03:00
|
|
|
#define PYD_TAGGED_SUFFIX PYD_DEBUG_SUFFIX ".cp" Py_STRINGIFY(PY_MAJOR_VERSION) Py_STRINGIFY(PY_MINOR_VERSION) PYD_THREADING_TAG ".pyd"
|
1999-12-20 17:18:49 -04:00
|
|
|
#endif
|
2014-12-16 00:45:23 -04:00
|
|
|
|
|
|
|
#define PYD_UNTAGGED_SUFFIX PYD_DEBUG_SUFFIX ".pyd"
|
|
|
|
|
|
|
|
const char *_PyImport_DynLoadFiletab[] = {
|
|
|
|
PYD_TAGGED_SUFFIX,
|
|
|
|
PYD_UNTAGGED_SUFFIX,
|
2012-05-04 16:20:40 -03:00
|
|
|
NULL
|
1999-12-20 17:18:49 -04:00
|
|
|
};
|
|
|
|
|
2000-10-05 07:54:45 -03:00
|
|
|
/* Function to return the name of the "python" DLL that the supplied module
|
|
|
|
directly imports. Looks through the list of imported modules and
|
|
|
|
returns the first entry that starts with "python" (case sensitive) and
|
|
|
|
is followed by nothing but numbers until the separator (period).
|
|
|
|
|
|
|
|
Returns a pointer to the import name, or NULL if no matching name was
|
|
|
|
located.
|
|
|
|
|
|
|
|
This function parses through the PE header for the module as loaded in
|
|
|
|
memory by the system loader. The PE header is accessed as documented by
|
|
|
|
Microsoft in the MSDN PE and COFF specification (2/99), and handles
|
|
|
|
both PE32 and PE32+. It only worries about the direct import table and
|
|
|
|
not the delay load import table since it's unlikely an extension is
|
|
|
|
going to be delay loading Python (after all, it's already loaded).
|
|
|
|
|
|
|
|
If any magic values are not found (e.g., the PE header or optional
|
|
|
|
header magic), then this function simply returns NULL. */
|
|
|
|
|
|
|
|
#define DWORD_AT(mem) (*(DWORD *)(mem))
|
|
|
|
#define WORD_AT(mem) (*(WORD *)(mem))
|
|
|
|
|
|
|
|
static char *GetPythonImport (HINSTANCE hModule)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
unsigned char *dllbase, *import_data, *import_name;
|
|
|
|
DWORD pe_offset, opt_offset;
|
|
|
|
WORD opt_magic;
|
|
|
|
int num_dict_off, import_off;
|
|
|
|
|
|
|
|
/* Safety check input */
|
|
|
|
if (hModule == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Module instance is also the base load address. First portion of
|
|
|
|
memory is the MS-DOS loader, which holds the offset to the PE
|
|
|
|
header (from the load base) at 0x3C */
|
|
|
|
dllbase = (unsigned char *)hModule;
|
|
|
|
pe_offset = DWORD_AT(dllbase + 0x3C);
|
|
|
|
|
|
|
|
/* The PE signature must be "PE\0\0" */
|
|
|
|
if (memcmp(dllbase+pe_offset,"PE\0\0",4)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Following the PE signature is the standard COFF header (20
|
|
|
|
bytes) and then the optional header. The optional header starts
|
|
|
|
with a magic value of 0x10B for PE32 or 0x20B for PE32+ (PE32+
|
|
|
|
uses 64-bits for some fields). It might also be 0x107 for a ROM
|
|
|
|
image, but we don't process that here.
|
|
|
|
|
|
|
|
The optional header ends with a data dictionary that directly
|
|
|
|
points to certain types of data, among them the import entries
|
|
|
|
(in the second table entry). Based on the header type, we
|
|
|
|
determine offsets for the data dictionary count and the entry
|
|
|
|
within the dictionary pointing to the imports. */
|
|
|
|
|
|
|
|
opt_offset = pe_offset + 4 + 20;
|
|
|
|
opt_magic = WORD_AT(dllbase+opt_offset);
|
|
|
|
if (opt_magic == 0x10B) {
|
|
|
|
/* PE32 */
|
|
|
|
num_dict_off = 92;
|
|
|
|
import_off = 104;
|
|
|
|
} else if (opt_magic == 0x20B) {
|
|
|
|
/* PE32+ */
|
|
|
|
num_dict_off = 108;
|
|
|
|
import_off = 120;
|
|
|
|
} else {
|
|
|
|
/* Unsupported */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now if an import table exists, offset to it and walk the list of
|
|
|
|
imports. The import table is an array (ending when an entry has
|
|
|
|
empty values) of structures (20 bytes each), which contains (at
|
|
|
|
offset 12) a relative address (to the module base) at which a
|
|
|
|
string constant holding the import name is located. */
|
|
|
|
|
|
|
|
if (DWORD_AT(dllbase + opt_offset + num_dict_off) >= 2) {
|
|
|
|
/* We have at least 2 tables - the import table is the second
|
|
|
|
one. But still it may be that the table size is zero */
|
|
|
|
if (0 == DWORD_AT(dllbase + opt_offset + import_off + sizeof(DWORD)))
|
|
|
|
return NULL;
|
|
|
|
import_data = dllbase + DWORD_AT(dllbase +
|
|
|
|
opt_offset +
|
|
|
|
import_off);
|
|
|
|
while (DWORD_AT(import_data)) {
|
|
|
|
import_name = dllbase + DWORD_AT(import_data+12);
|
|
|
|
if (strlen(import_name) >= 6 &&
|
|
|
|
!strncmp(import_name,"python",6)) {
|
|
|
|
char *pch;
|
|
|
|
|
2023-02-08 10:23:57 -04:00
|
|
|
/* Don't claim that python3.dll is a Python DLL. */
|
|
|
|
#ifdef _DEBUG
|
|
|
|
if (strcmp(import_name, "python3_d.dll") == 0) {
|
|
|
|
#else
|
2010-12-03 16:14:31 -04:00
|
|
|
if (strcmp(import_name, "python3.dll") == 0) {
|
2023-02-08 10:23:57 -04:00
|
|
|
#endif
|
2010-12-03 16:14:31 -04:00
|
|
|
import_data += 20;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Ensure python prefix is followed only
|
|
|
|
by numbers to the end of the basename */
|
|
|
|
pch = import_name + 6;
|
2004-07-02 05:53:57 -03:00
|
|
|
#ifdef _DEBUG
|
2010-05-09 12:52:27 -03:00
|
|
|
while (*pch && pch[0] != '_' && pch[1] != 'd' && pch[2] != '.') {
|
2004-07-02 05:53:57 -03:00
|
|
|
#else
|
2010-05-09 12:52:27 -03:00
|
|
|
while (*pch && *pch != '.') {
|
2004-07-02 05:53:57 -03:00
|
|
|
#endif
|
2010-05-09 12:52:27 -03:00
|
|
|
if (*pch >= '0' && *pch <= '9') {
|
|
|
|
pch++;
|
|
|
|
} else {
|
|
|
|
pch = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pch) {
|
|
|
|
/* Found it - return the name */
|
|
|
|
return import_name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
import_data += 20;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
2000-10-05 07:54:45 -03:00
|
|
|
}
|
|
|
|
|
2023-03-09 17:09:12 -04:00
|
|
|
#ifdef Py_ENABLE_SHARED
|
2021-12-02 20:08:42 -04:00
|
|
|
/* Load python3.dll before loading any extension module that might refer
|
|
|
|
to it. That way, we can be sure that always the python3.dll corresponding
|
|
|
|
to this python DLL is loaded, not a python3.dll that might be on the path
|
|
|
|
by chance.
|
|
|
|
Return whether the DLL was found.
|
|
|
|
*/
|
|
|
|
extern HMODULE PyWin_DLLhModule;
|
|
|
|
static int
|
|
|
|
_Py_CheckPython3(void)
|
|
|
|
{
|
|
|
|
static int python3_checked = 0;
|
|
|
|
static HANDLE hPython3;
|
|
|
|
#define MAXPATHLEN 512
|
|
|
|
wchar_t py3path[MAXPATHLEN+1];
|
|
|
|
if (python3_checked) {
|
|
|
|
return hPython3 != NULL;
|
|
|
|
}
|
|
|
|
python3_checked = 1;
|
|
|
|
|
|
|
|
/* If there is a python3.dll next to the python3y.dll,
|
|
|
|
use that DLL */
|
|
|
|
if (PyWin_DLLhModule && GetModuleFileNameW(PyWin_DLLhModule, py3path, MAXPATHLEN)) {
|
|
|
|
wchar_t *p = wcsrchr(py3path, L'\\');
|
|
|
|
if (p) {
|
|
|
|
wcscpy(p + 1, PY3_DLLNAME);
|
|
|
|
hPython3 = LoadLibraryExW(py3path, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
|
|
|
|
if (hPython3 != NULL) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we can locate python3.dll in our application dir,
|
|
|
|
use that DLL */
|
|
|
|
hPython3 = LoadLibraryExW(PY3_DLLNAME, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR);
|
|
|
|
if (hPython3 != NULL) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* For back-compat, also search {sys.prefix}\DLLs, though
|
|
|
|
that has not been a normal install layout for a while */
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
PyConfig *config = (PyConfig*)_PyInterpreterState_GetConfig(interp);
|
|
|
|
assert(config->prefix);
|
|
|
|
if (config->prefix) {
|
|
|
|
wcscpy_s(py3path, MAXPATHLEN, config->prefix);
|
|
|
|
if (py3path[0] && _Py_add_relfile(py3path, L"DLLs\\" PY3_DLLNAME, MAXPATHLEN) >= 0) {
|
|
|
|
hPython3 = LoadLibraryExW(py3path, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return hPython3 != NULL;
|
|
|
|
#undef MAXPATHLEN
|
|
|
|
}
|
2023-03-09 17:09:12 -04:00
|
|
|
#endif /* Py_ENABLE_SHARED */
|
2021-12-02 20:08:42 -04:00
|
|
|
|
2015-05-23 09:24:10 -03:00
|
|
|
dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix,
|
|
|
|
const char *shortname,
|
|
|
|
PyObject *pathname, FILE *fp)
|
1999-12-20 17:18:49 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
dl_funcptr p;
|
|
|
|
char funcname[258], *import_python;
|
|
|
|
|
2023-03-09 17:09:12 -04:00
|
|
|
#ifdef Py_ENABLE_SHARED
|
2010-12-03 16:14:31 -04:00
|
|
|
_Py_CheckPython3();
|
2023-03-09 17:09:12 -04:00
|
|
|
#endif /* Py_ENABLE_SHARED */
|
2010-12-03 16:14:31 -04:00
|
|
|
|
2020-07-10 17:26:06 -03:00
|
|
|
wchar_t *wpathname = PyUnicode_AsWideCharString(pathname, NULL);
|
2011-11-20 21:01:41 -04:00
|
|
|
if (wpathname == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2015-05-23 12:59:25 -03:00
|
|
|
PyOS_snprintf(funcname, sizeof(funcname), "%.20s_%.200s", prefix, shortname);
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
{
|
|
|
|
HINSTANCE hDLL = NULL;
|
2023-03-09 17:09:12 -04:00
|
|
|
#ifdef MS_WINDOWS_DESKTOP
|
2010-05-09 12:52:27 -03:00
|
|
|
unsigned int old_mode;
|
2011-10-02 15:35:10 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Don't display a message box when Python can't load a DLL */
|
|
|
|
old_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
|
2023-03-09 17:09:12 -04:00
|
|
|
#endif
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2019-03-29 20:37:16 -03:00
|
|
|
/* bpo-36085: We use LoadLibraryEx with restricted search paths
|
|
|
|
to avoid DLL preloading attacks and enable use of the
|
|
|
|
AddDllDirectory function. We add SEARCH_DLL_LOAD_DIR to
|
|
|
|
ensure DLLs adjacent to the PYD are preferred. */
|
2019-02-02 13:16:42 -04:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2011-11-20 21:01:41 -04:00
|
|
|
hDLL = LoadLibraryExW(wpathname, NULL,
|
2019-03-29 20:37:16 -03:00
|
|
|
LOAD_LIBRARY_SEARCH_DEFAULT_DIRS |
|
|
|
|
LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);
|
2019-02-02 13:16:42 -04:00
|
|
|
Py_END_ALLOW_THREADS
|
2020-07-10 17:26:06 -03:00
|
|
|
PyMem_Free(wpathname);
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2023-03-09 17:09:12 -04:00
|
|
|
#ifdef MS_WINDOWS_DESKTOP
|
2010-05-09 12:52:27 -03:00
|
|
|
/* restore old error mode settings */
|
|
|
|
SetErrorMode(old_mode);
|
2023-03-09 17:09:12 -04:00
|
|
|
#endif
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
if (hDLL==NULL){
|
|
|
|
PyObject *message;
|
|
|
|
unsigned int errorCode;
|
|
|
|
|
|
|
|
/* Get an error string from Win32 error code */
|
|
|
|
wchar_t theInfo[256]; /* Pointer to error text
|
|
|
|
from system */
|
|
|
|
int theLength; /* Length of error text */
|
|
|
|
|
|
|
|
errorCode = GetLastError();
|
|
|
|
|
|
|
|
theLength = FormatMessageW(
|
|
|
|
FORMAT_MESSAGE_FROM_SYSTEM |
|
|
|
|
FORMAT_MESSAGE_IGNORE_INSERTS, /* flags */
|
|
|
|
NULL, /* message source */
|
|
|
|
errorCode, /* the message (error) ID */
|
|
|
|
MAKELANGID(LANG_NEUTRAL,
|
|
|
|
SUBLANG_DEFAULT),
|
|
|
|
/* Default language */
|
|
|
|
theInfo, /* the buffer */
|
2013-03-23 20:05:36 -03:00
|
|
|
sizeof(theInfo) / sizeof(wchar_t), /* size in wchars */
|
2010-05-09 12:52:27 -03:00
|
|
|
NULL); /* no additional format args. */
|
|
|
|
|
|
|
|
/* Problem: could not get the error message.
|
|
|
|
This should not happen if called correctly. */
|
|
|
|
if (theLength == 0) {
|
|
|
|
message = PyUnicode_FromFormat(
|
2019-08-17 17:50:39 -03:00
|
|
|
"DLL load failed with error code %u while importing %s",
|
|
|
|
errorCode, shortname);
|
2010-05-09 12:52:27 -03:00
|
|
|
} else {
|
|
|
|
/* For some reason a \r\n
|
|
|
|
is appended to the text */
|
|
|
|
if (theLength >= 2 &&
|
|
|
|
theInfo[theLength-2] == '\r' &&
|
|
|
|
theInfo[theLength-1] == '\n') {
|
|
|
|
theLength -= 2;
|
|
|
|
theInfo[theLength] = '\0';
|
|
|
|
}
|
2019-08-17 17:50:39 -03:00
|
|
|
message = PyUnicode_FromFormat(
|
|
|
|
"DLL load failed while importing %s: ", shortname);
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
PyUnicode_AppendAndDel(&message,
|
2011-11-21 21:27:30 -04:00
|
|
|
PyUnicode_FromWideChar(
|
2010-05-09 12:52:27 -03:00
|
|
|
theInfo,
|
|
|
|
theLength));
|
|
|
|
}
|
2011-10-02 15:35:10 -03:00
|
|
|
if (message != NULL) {
|
2013-06-10 11:38:54 -03:00
|
|
|
PyObject *shortname_obj = PyUnicode_FromString(shortname);
|
|
|
|
PyErr_SetImportError(message, shortname_obj, pathname);
|
|
|
|
Py_XDECREF(shortname_obj);
|
2012-04-17 18:57:09 -03:00
|
|
|
Py_DECREF(message);
|
2011-10-02 15:35:10 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
|
|
|
} else {
|
|
|
|
char buffer[256];
|
2000-10-05 07:54:45 -03:00
|
|
|
|
2011-04-04 18:05:53 -03:00
|
|
|
PyOS_snprintf(buffer, sizeof(buffer),
|
2004-07-02 05:53:57 -03:00
|
|
|
#ifdef _DEBUG
|
2011-04-04 18:05:53 -03:00
|
|
|
"python%d%d_d.dll",
|
2004-07-02 05:53:57 -03:00
|
|
|
#else
|
2011-04-04 18:05:53 -03:00
|
|
|
"python%d%d.dll",
|
2004-07-02 05:53:57 -03:00
|
|
|
#endif
|
2010-05-09 12:52:27 -03:00
|
|
|
PY_MAJOR_VERSION,PY_MINOR_VERSION);
|
|
|
|
import_python = GetPythonImport(hDLL);
|
|
|
|
|
|
|
|
if (import_python &&
|
2019-07-13 10:11:43 -03:00
|
|
|
_stricmp(buffer,import_python)) {
|
2011-04-04 18:05:53 -03:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Module use of %.150s conflicts "
|
|
|
|
"with this version of Python.",
|
|
|
|
import_python);
|
2019-02-02 13:16:42 -04:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2010-05-09 12:52:27 -03:00
|
|
|
FreeLibrary(hDLL);
|
2019-02-02 13:16:42 -04:00
|
|
|
Py_END_ALLOW_THREADS
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2019-02-02 13:16:42 -04:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2010-05-09 12:52:27 -03:00
|
|
|
p = GetProcAddress(hDLL, funcname);
|
2019-02-02 13:16:42 -04:00
|
|
|
Py_END_ALLOW_THREADS
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
return p;
|
1999-12-20 17:18:49 -04:00
|
|
|
}
|