diff options
| author | Christian Tismer <tismer@stackless.com> | 2015-12-27 22:31:10 +0100 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2015-12-27 22:31:10 +0100 |
| commit | 888e84b4e9ebd2872560ff69a75b06041a21069e (patch) | |
| tree | 40f1a4607349048cd1cb411d67fd9770a0d84a8d | |
| parent | fc7e44469a6252c59a1919842a553c0c30d2ad87 (diff) | |
| parent | d4bec08abac4f54a89919081443daa3cc0ed99d8 (diff) | |
Merge pull request #19 from dbrnz/shiboken2_so
Name of shiboken Python package is inconsistent.
| -rw-r--r-- | shibokenmodule/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | shibokenmodule/typesystem_shiboken.xml | 2 | ||||
| -rw-r--r-- | tests/otherbinding/objtypehashes_test.py | 2 | ||||
| -rw-r--r-- | tests/samplebinding/delete_test.py | 2 | ||||
| -rw-r--r-- | tests/samplebinding/objecttype_test.py | 2 | ||||
| -rw-r--r-- | tests/samplebinding/privatedtor_test.py | 2 | ||||
| -rw-r--r-- | tests/shibokenmodule/module_test.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/shibokenmodule/CMakeLists.txt b/shibokenmodule/CMakeLists.txt index c4d2a16..4435f16 100644 --- a/shibokenmodule/CMakeLists.txt +++ b/shibokenmodule/CMakeLists.txt @@ -5,7 +5,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shibokenmodule.txt.in" set(sample_SRC -${CMAKE_CURRENT_BINARY_DIR}/shiboken/shiboken_module_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/shiboken2/shiboken2_module_wrapper.cpp ) add_custom_command(OUTPUT ${sample_SRC} diff --git a/shibokenmodule/typesystem_shiboken.xml b/shibokenmodule/typesystem_shiboken.xml index 55d47d9..079ce35 100644 --- a/shibokenmodule/typesystem_shiboken.xml +++ b/shibokenmodule/typesystem_shiboken.xml @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<typesystem package="shiboken"> +<typesystem package="shiboken2"> <custom-type name="PyObject" /> <custom-type name="PyType" /> <primitive-type name="bool" /> diff --git a/tests/otherbinding/objtypehashes_test.py b/tests/otherbinding/objtypehashes_test.py index 24f3b1e..a73dff3 100644 --- a/tests/otherbinding/objtypehashes_test.py +++ b/tests/otherbinding/objtypehashes_test.py @@ -1,7 +1,7 @@ import unittest from sample import * from other import * -import shiboken +import shiboken2 as shiboken class TestHashFuncs (unittest.TestCase): diff --git a/tests/samplebinding/delete_test.py b/tests/samplebinding/delete_test.py index 4448025..04293f1 100644 --- a/tests/samplebinding/delete_test.py +++ b/tests/samplebinding/delete_test.py @@ -26,7 +26,7 @@ import unittest import sample -import shiboken +import shiboken2 as shiboken class DeleteTest(unittest.TestCase): def testNonCppWrapperClassDelete(self): diff --git a/tests/samplebinding/objecttype_test.py b/tests/samplebinding/objecttype_test.py index 814e258..6794cb5 100644 --- a/tests/samplebinding/objecttype_test.py +++ b/tests/samplebinding/objecttype_test.py @@ -30,7 +30,7 @@ import unittest import sys from sample import ObjectType, Str -import shiboken +import shiboken2 as shiboken class ObjectTypeTest(unittest.TestCase): diff --git a/tests/samplebinding/privatedtor_test.py b/tests/samplebinding/privatedtor_test.py index 795e526..58631fe 100644 --- a/tests/samplebinding/privatedtor_test.py +++ b/tests/samplebinding/privatedtor_test.py @@ -30,7 +30,7 @@ import gc import sys import unittest -import shiboken +import shiboken2 as shiboken from sample import PrivateDtor diff --git a/tests/shibokenmodule/module_test.py b/tests/shibokenmodule/module_test.py index 54c47de..64a3662 100644 --- a/tests/shibokenmodule/module_test.py +++ b/tests/shibokenmodule/module_test.py @@ -1,4 +1,4 @@ -import shiboken +import shiboken2 as shiboken import unittest from sample import * |