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

Python3 removes support for relative imports

Browse source
This commit is contained in:
Mike Romberg 2016-04-04 12:20:58 -06:00
commit ca63491d7a
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Modules/python.cxx
View file

@ -863,7 +863,14 @@ public:
Printv(f_shadow, "del version_info\n", NULL); Printv(f_shadow, "del version_info\n", NULL);
if (builtin) { if (builtin) {
Printf(f_shadow, "from %s import *\n", module); /*
* Python3 removes relative imports. So 'from _foo import *'
* will only work for non-package modules.
*/
Printv(f_shadow, "if __name__.rpartition('.')[0] != '':\n", NULL);
Printf(f_shadow, tab4 "from .%s import *\n", module);
Printv(f_shadow, "else:\n", NULL);
Printf(f_shadow, tab4 "from %s import *\n", module);
} }
if (modern || !classic) { if (modern || !classic) {
Printv(f_shadow, "try:\n", tab4, "_swig_property = property\n", "except NameError:\n", tab4, "pass # Python < 2.2 doesn't have 'property'.\n\n", NULL); Printv(f_shadow, "try:\n", tab4, "_swig_property = property\n", "except NameError:\n", tab4, "pass # Python < 2.2 doesn't have 'property'.\n\n", NULL);