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

Fix fully qualified package paths for Python 3 even if a module is in the same package

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13955 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2012-12-11 18:42:58 +00:00
commit 4c1b566f62
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.9 (in progress) Version 2.0.9 (in progress)
=========================== ===========================
2012-12-11: wsfulton
[Python] Apply patch #3590522 - fully qualified package paths for Python 3 even if a module is in the
same package.
2012-12-08: wsfulton 2012-12-08: wsfulton
[Python] Bug #3563647 - PyInt_FromSize_t unavailable prior to Python 2.5 for unsigned int types. [Python] Bug #3563647 - PyInt_FromSize_t unavailable prior to Python 2.5 for unsigned int types.

6
Source/Modules/python.cxx
View file

@ -1049,7 +1049,7 @@ public:
// of this module.) // of this module.)
Node *options = Getattr(mod, "options"); Node *options = Getattr(mod, "options");
String *pkg = options ? Getattr(options, "package") : 0; String *pkg = options ? Getattr(options, "package") : 0;
if (pkg && (!package || Strcmp(pkg, package) != 0)) { if (pkg) {
Printf(import, "%s.", pkg); Printf(import, "%s.", pkg);
} }
// finally, output the name of the imported module // finally, output the name of the imported module
@ -1057,7 +1057,7 @@ public:
if (!options || (!Getattr(options, "noshadow") && !Getattr(options, "noproxy"))) { if (!options || (!Getattr(options, "noshadow") && !Getattr(options, "noproxy"))) {
Printf(import, "_%s\n", modname); Printf(import, "_%s\n", modname);
if (!GetFlagAttr(f_shadow_imports, import)) { if (!GetFlagAttr(f_shadow_imports, import)) {
if (pkg && (!package || Strcmp(pkg, package) != 0)) { if (pkg) {
Printf(builtin ? f_shadow_builtin_imports : f_shadow, "import %s.%s\n", pkg, modname); Printf(builtin ? f_shadow_builtin_imports : f_shadow, "import %s.%s\n", pkg, modname);
} else { } else {
Printf(builtin ? f_shadow_builtin_imports : f_shadow, "import %s\n", modname); Printf(builtin ? f_shadow_builtin_imports : f_shadow, "import %s\n", modname);
@ -3168,7 +3168,7 @@ public:
// check if the module has a package option // check if the module has a package option
Node *options = Getattr(mod, "options"); Node *options = Getattr(mod, "options");
String *pkg = options ? Getattr(options, "package") : 0; String *pkg = options ? Getattr(options, "package") : 0;
if (pkg && (!package || Strcmp(pkg, package) != 0)) { if (pkg) {
Printf(importname, "%s.", pkg); Printf(importname, "%s.", pkg);
} }
Printf(importname, "%s.", modname); Printf(importname, "%s.", modname);