Author: jun66j5
Date: Thu Nov 12 04:12:43 2020
New Revision: 1883335
URL: http://svn.apache.org/viewvc?rev=1883335&view=rev
Log:
Fix unable to load *.pyd files with Python 3.8.x on Windows.
* subversion/bindings/swig/include/svn_global.swg
(SVN_PYTHON_MODULEIMPORT): Add custom code to add search paths to resolve DLL
dependencies when importing libsvn/*.pyd file.
* subversion/bindings/swig/core.i
* subversion/bindings/swig/svn_client.i
* subversion/bindings/swig/svn_delta.i
* subversion/bindings/swig/svn_diff.i
* subversion/bindings/swig/svn_fs.i
* subversion/bindings/swig/svn_ra.i
* subversion/bindings/swig/svn_repos.i
* subversion/bindings/swig/svn_wc.i
Add moduleimport option with SVN_PYTHON_MODULEIMPORT to %module directive for
Python.
Tested by: jcorvel
Reviewed by: jcorvel
futatuki
Modified:
subversion/trunk/subversion/bindings/swig/core.i
subversion/trunk/subversion/bindings/swig/include/svn_global.swg
subversion/trunk/subversion/bindings/swig/svn_client.i
subversion/trunk/subversion/bindings/swig/svn_delta.i
subversion/trunk/subversion/bindings/swig/svn_diff.i
subversion/trunk/subversion/bindings/swig/svn_fs.i
subversion/trunk/subversion/bindings/swig/svn_ra.i
subversion/trunk/subversion/bindings/swig/svn_repos.i
subversion/trunk/subversion/bindings/swig/svn_wc.i
Modified: subversion/trunk/subversion/bindings/swig/core.i
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/core.i?rev=1883335&r1=1883334&r2=1883335&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/core.i (original)
+++ subversion/trunk/subversion/bindings/swig/core.i Thu Nov 12 04:12:43 2020
@@ -23,16 +23,16 @@
* of the more specific module files.
*/
+%include svn_global.swg
+
#if defined(SWIGPYTHON)
-%module(package="libsvn") core
+%module(package="libsvn", moduleimport=SVN_PYTHON_MODULEIMPORT) core
#elif defined(SWIGPERL)
%module "SVN::_Core"
#elif defined(SWIGRUBY)
%module "svn::ext::core"
#endif
-%include svn_global.swg
-
%{
#include <apr.h>
#include <apr_general.h>
Modified: subversion/trunk/subversion/bindings/swig/include/svn_global.swg
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/include/svn_global.swg?rev=1883335&r1=1883334&r2=1883335&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/include/svn_global.swg (original)
+++ subversion/trunk/subversion/bindings/swig/include/svn_global.swg Thu Nov 12
04:12:43 2020
@@ -242,3 +242,40 @@ static VALUE *_global_vresult_address =
/* Now, include the main Subversion typemap library. */
%include svn_types.swg
%include proxy.swg
+
+
+#ifdef SWIGPYTHON
+/* Since Python 3.8+ on Windows, DLL dependencies when loading *.pyd file
+ * searches only the system paths, the directory containing the *.pyd file and
+ * the directories added with os.add_dll_directory().
+ * See also https://bugs.python.org/issue36085.
+ */
+%define SVN_PYTHON_MODULEIMPORT
+"
+def _dll_paths():
+ import os
+ if hasattr(os, 'add_dll_directory'): # Python 3.8+ on Windows
+ cookies = []
+ for path in os.environ.get('PATH', '').split(os.pathsep):
+ if path and os.path.isabs(path):
+ try:
+ cookie = os.add_dll_directory(path)
+ except OSError:
+ continue
+ else:
+ cookies.append(cookie)
+ return cookies
+ else:
+ return ()
+
+_dll_paths = _dll_paths()
+try:
+ from . import $module
+finally:
+ _dll_path = None
+ for _dll_path in _dll_paths:
+ _dll_path.close()
+ del _dll_paths, _dll_path
+"
+%enddef
+#endif
Modified: subversion/trunk/subversion/bindings/swig/svn_client.i
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/svn_client.i?rev=1883335&r1=1883334&r2=1883335&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/svn_client.i (original)
+++ subversion/trunk/subversion/bindings/swig/svn_client.i Thu Nov 12 04:12:43
2020
@@ -21,15 +21,16 @@
* svn_client.i: SWIG interface file for svn_client.h
*/
+%include svn_global.swg
+
#if defined(SWIGPYTHON)
-%module(package="libsvn") client
+%module(package="libsvn", moduleimport=SVN_PYTHON_MODULEIMPORT) client
#elif defined(SWIGPERL)
%module "SVN::_Client"
#elif defined(SWIGRUBY)
%module "svn::ext::client"
#endif
-%include svn_global.swg
%import core.i
%import svn_delta.i
%import svn_wc.i
Modified: subversion/trunk/subversion/bindings/swig/svn_delta.i
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/svn_delta.i?rev=1883335&r1=1883334&r2=1883335&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/svn_delta.i (original)
+++ subversion/trunk/subversion/bindings/swig/svn_delta.i Thu Nov 12 04:12:43
2020
@@ -21,15 +21,16 @@
* svn_delta.i: SWIG interface file for svn_delta.h
*/
+%include svn_global.swg
+
#if defined(SWIGPYTHON)
-%module(package="libsvn") delta
+%module(package="libsvn", moduleimport=SVN_PYTHON_MODULEIMPORT) delta
#elif defined(SWIGPERL)
%module "SVN::_Delta"
#elif defined(SWIGRUBY)
%module "svn::ext::delta"
#endif
-%include svn_global.swg
%import core.i
#ifdef SWIGRUBY
Modified: subversion/trunk/subversion/bindings/swig/svn_diff.i
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/svn_diff.i?rev=1883335&r1=1883334&r2=1883335&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/svn_diff.i (original)
+++ subversion/trunk/subversion/bindings/swig/svn_diff.i Thu Nov 12 04:12:43
2020
@@ -21,15 +21,16 @@
* svn_diff.i: SWIG interface file for svn_diff.h
*/
+%include svn_global.swg
+
#if defined(SWIGPYTHON)
-%module(package="libsvn") diff
+%module(package="libsvn", moduleimport=SVN_PYTHON_MODULEIMPORT) diff
#elif defined(SWIGPERL)
%module "SVN::_Diff"
#elif defined(SWIGRUBY)
%module "svn::ext::diff"
#endif
-%include svn_global.swg
%import core.i
/* -----------------------------------------------------------------------
Modified: subversion/trunk/subversion/bindings/swig/svn_fs.i
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/svn_fs.i?rev=1883335&r1=1883334&r2=1883335&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/svn_fs.i (original)
+++ subversion/trunk/subversion/bindings/swig/svn_fs.i Thu Nov 12 04:12:43 2020
@@ -21,15 +21,16 @@
* svn_fs.i: SWIG interface file for svn_fs.h
*/
+%include svn_global.swg
+
#if defined(SWIGPYTHON)
-%module(package="libsvn") fs
+%module(package="libsvn", moduleimport=SVN_PYTHON_MODULEIMPORT) fs
#elif defined(SWIGPERL)
%module "SVN::_Fs"
#elif defined(SWIGRUBY)
%module "svn::ext::fs"
#endif
-%include svn_global.swg
%import core.i
%import svn_delta.i
Modified: subversion/trunk/subversion/bindings/swig/svn_ra.i
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/svn_ra.i?rev=1883335&r1=1883334&r2=1883335&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/svn_ra.i (original)
+++ subversion/trunk/subversion/bindings/swig/svn_ra.i Thu Nov 12 04:12:43 2020
@@ -21,15 +21,16 @@
* svn_ra.i: SWIG interface file for svn_ra.h
*/
+%include svn_global.swg
+
#if defined(SWIGPYTHON)
-%module(package="libsvn") ra
+%module(package="libsvn", moduleimport=SVN_PYTHON_MODULEIMPORT) ra
#elif defined(SWIGPERL)
%module "SVN::_Ra"
#elif defined(SWIGRUBY)
%module "svn::ext::ra"
#endif
-%include svn_global.swg
%import core.i
%import svn_delta.i
Modified: subversion/trunk/subversion/bindings/swig/svn_repos.i
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/svn_repos.i?rev=1883335&r1=1883334&r2=1883335&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/svn_repos.i (original)
+++ subversion/trunk/subversion/bindings/swig/svn_repos.i Thu Nov 12 04:12:43
2020
@@ -21,15 +21,16 @@
* svn_repos.i: SWIG interface file for svn_repos.h
*/
+%include svn_global.swg
+
#if defined(SWIGPYTHON)
-%module(package="libsvn") repos
+%module(package="libsvn", moduleimport=SVN_PYTHON_MODULEIMPORT) repos
#elif defined(SWIGPERL)
%module "SVN::_Repos"
#elif defined(SWIGRUBY)
%module "svn::ext::repos"
#endif
-%include svn_global.swg
%import core.i
%import svn_delta.i
%import svn_fs.i
Modified: subversion/trunk/subversion/bindings/swig/svn_wc.i
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/svn_wc.i?rev=1883335&r1=1883334&r2=1883335&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/svn_wc.i (original)
+++ subversion/trunk/subversion/bindings/swig/svn_wc.i Thu Nov 12 04:12:43 2020
@@ -21,15 +21,16 @@
* svn_wc.i: SWIG interface file for svn_wc.h
*/
+%include svn_global.swg
+
#if defined(SWIGPYTHON)
-%module(package="libsvn") wc
+%module(package="libsvn", moduleimport=SVN_PYTHON_MODULEIMPORT) wc
#elif defined(SWIGPERL)
%module "SVN::_Wc"
#elif defined(SWIGRUBY)
%module "svn::ext::wc"
#endif
-%include svn_global.swg
%import core.i
%import svn_delta.i
%import svn_ra.i
