diff --git a/etg/_core.py b/etg/_core.py index 18d5f461..0697c657 100644 --- a/etg/_core.py +++ b/etg/_core.py @@ -161,8 +161,8 @@ INCLUDES = [ # core 'tipwin', # misc - 'process', 'utils', + 'process', 'uiaction', 'snglinst', diff --git a/etgtools/pi_generator.py b/etgtools/pi_generator.py index 1cf9e069..b1fb3498 100644 --- a/etgtools/pi_generator.py +++ b/etgtools/pi_generator.py @@ -45,7 +45,7 @@ class PiWrapperGenerator(generators.WrapperGeneratorBase): def generate(self, module, destFile=None): stream = StringIO() - # generate SIP code from the module and its objects + # process the module object and its child objects self.generateModule(module, stream) # Write the contents of the stream to the destination file @@ -105,6 +105,11 @@ class PiWrapperGenerator(generators.WrapperGeneratorBase): """ assert isinstance(module, extractors.ModuleDef) + for item in module.imports: + if item.startswith('_'): + item = item[1:] + stream.write('from %s import *\n' % item) + methodMap = { extractors.ClassDef : self.generateClass, extractors.DefineDef : self.generateDefine, diff --git a/unittests/test_aboutdlg.py b/unittests/test_aboutdlg.py index e5e321f2..0bb7b175 100644 --- a/unittests/test_aboutdlg.py +++ b/unittests/test_aboutdlg.py @@ -13,6 +13,7 @@ class aboutdlg_Tests(wtc.WidgetTestCase): info.SetName('My Goofy App') info.SetDevelopers(['Goofy', 'Mickey', 'Donald']) info.SetDescription('This is a very goofy application') + info.SetCopyright('(c) by Goofy Enterprises, Inc.') return info def test_aboutdlgNative(self): diff --git a/unittests/test_pi_import.py b/unittests/test_pi_import.py index 4b05a1e8..1b4c93f8 100644 --- a/unittests/test_pi_import.py +++ b/unittests/test_pi_import.py @@ -11,7 +11,7 @@ class PIImportTest(unittest.TestCase): the extension modules and that are not easily introspected. This test case ensures that the code in the pi files is valid by trying - to run the file with a with a new instance of Python. + to run the file with a new instance of Python. """ def runPI(self, filename): @@ -34,6 +34,8 @@ class PIImportTest(unittest.TestCase): def test_core_pi(self): self.runPI('core.pi') + #def test_adv_pi(self): + # self.runPI('adv.pi') #---------------------------------------------------------------------------