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

Apply patch #2143727 for Python from Serge Monkewitz to fix importing base classes when the package option is specified in %module and that module is %import'ed

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10960 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2008-12-02 20:21:16 +00:00
commit 1c4ec59e45
8 changed files with 44 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGES.current
View file

@ -1,10 +1,14 @@
Version 1.3.37 (in progress)
============================
2008-12-02: wsfulton
[Python] Apply patch #2143727 from Serge Monkewitz to fix importing base classes
when the package option is specified in %module and that module is %import'ed.
2008-11-28: wsfulton
[UTL] Fix some incorrect acceptance of types in the STL, eg a double * element passed
into a vector<int *> constructor would be accepted, but the ensuing behaviour was
undefined. Now the type conversion correctly raises an exception.
[UTL] Fix #2080497. Some incorrect acceptance of types in the STL, eg a double * element
passed into a vector<int *> constructor would be accepted, but the ensuing behaviour
was undefined. Now the type conversion correctly raises an exception.
2008-11-24: wsfulton
Add -outcurrentdir option. This sets the default output directory to the current

9
Examples/test-suite/packageoption.h
View file

@ -1,5 +1,6 @@
class A
{
public:
int testInt() { return 2;}
struct Base {
virtual int vmethod() { return 1; }
int basemethod() { return 1; }
virtual ~Base() {}
};

1
Examples/test-suite/packageoption.list
View file

@ -1,2 +1,3 @@
packageoption_a
packageoption_b
packageoption_c

10
Examples/test-suite/packageoption_a.i
View file

@ -1,4 +1,4 @@
%module(package="C") "packageoption_a";
%module(package="CommonPackage") "packageoption_a";
%inline %{
class A
@ -6,5 +6,11 @@ class A
public:
int testInt() { return 2;}
};
%}
%{
#include "packageoption.h"
%}
%include "packageoption.h"

2
Examples/test-suite/packageoption_b.i
View file

@ -1,4 +1,4 @@
%module(package="C") "packageoption_b";
%module(package="CommonPackage") "packageoption_b";
%inline %{
class B

13
Examples/test-suite/packageoption_c.i Normal file
View file

@ -0,0 +1,13 @@
%module(package="PackageC") "packageoption_c";
%import "packageoption_a.i"
%inline %{
#include "packageoption.h"
struct Derived : Base {
virtual int vmethod() { return 2; }
virtual ~Derived() {}
};
%}

8
Examples/test-suite/perl5/packageoption_runme.pl
View file

@ -14,11 +14,11 @@ sub ok_not ($;$) {
ok($test, $name);
}
my $a = C::A->new();
my $a = CommonPackage::A->new();
isa_ok($a, 'C::A');
isa_ok($a, 'CommonPackage::A');
my $b = C::B->new();
my $b = CommonPackage::B->new();
isa_ok($b, 'C::B');
isa_ok($b, 'CommonPackage::B');

6
Source/Modules/python.cxx
View file

@ -925,7 +925,11 @@ public:
if (!options || (!Getattr(options, "noshadow") && !Getattr(options, "noproxy"))) {
Printf(import, "_%s\n", modname);
if (!Strstr(f_shadow_imports, import)) {
Printf(f_shadow, "import %s\n", modname);
if (pkg && (!package || Strcmp(pkg, package) != 0)) {
Printf(f_shadow, "import %s.%s\n", pkg, modname);
} else {
Printf(f_shadow, "import %s\n", modname);
}
Printv(f_shadow_imports, import, NULL);
}
}