jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More Python module loading simplification

Browse source 
Slightly faster checking to see if a module is in a package.
Issue #848
This commit is contained in:
William S Fulton 2018-12-18 07:50:48 +00:00
commit 355395200f
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/Manual/Python.html
View file

@ -6282,7 +6282,7 @@ The code is generated into the pure Python module, foo.py, and merely imports th
<div class="targetlang">
<pre>
if __package__ or __name__.rpartition('.')[0]:
if __package__ or '.' in __name__:
from . import _foo
else:
import _foo
@ -6367,7 +6367,7 @@ The default import loading code is thus different:
<div class="targetlang">
<pre>
if __package__ or __name__.rpartition('.')[0]:
if __package__ or '.' in __name__:
from ._foo import *
else:
from _foo import *

4
Source/Modules/python.cxx
View file

@ -693,13 +693,13 @@ public:
* same package, otherwise load it as a global module.
*/
Printv(default_import_code, "# Import the low-level C/C++ module\n", NULL);
Printv(default_import_code, "if __package__ or __name__.rpartition('.')[0]:\n", NULL);
Printv(default_import_code, "if __package__ or '.' in __name__:\n", NULL);
Printv(default_import_code, tab4, "from . import ", module, "\n", NULL);
Printv(default_import_code, "else:\n", NULL);
Printv(default_import_code, tab4, "import ", module, "\n", NULL);
} else {
Printv(default_import_code, "# Pull in all the attributes from the low-level C/C++ module\n", NULL);
Printv(default_import_code, "if __package__ or __name__.rpartition('.')[0]:\n", NULL);
Printv(default_import_code, "if __package__ or '.' in __name__:\n", NULL);
Printv(default_import_code, tab4, "from .", module, " import *\n", NULL);
Printv(default_import_code, "else:\n", NULL);
Printv(default_import_code, tab4, "from ", module, " import *\n", NULL);