From af7aed10bd0aff4a9cedd69768dbe37737fc1acc Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 4 Mar 2020 10:52:32 +0100 Subject: Fix name clash of the test helpers Rename sources/shiboken2/tests/helper.py to shiboken_test_helper.py to avoid clashes with sources/pyside2/tests/util/helper. Change-Id: Ifd89a6f79ea2bb4df4d21e905800853db962ffb0 Reviewed-by: Cristian Maureira-Fredes --- sources/shiboken2/tests/samplebinding/namespace_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources/shiboken2/tests/samplebinding/namespace_test.py') diff --git a/sources/shiboken2/tests/samplebinding/namespace_test.py b/sources/shiboken2/tests/samplebinding/namespace_test.py index b1977cf6f..23480d4c4 100644 --- a/sources/shiboken2/tests/samplebinding/namespace_test.py +++ b/sources/shiboken2/tests/samplebinding/namespace_test.py @@ -40,7 +40,7 @@ from shiboken_paths import init_paths init_paths() from sample import * -from helper import objectFullname +from shiboken_test_helper import objectFullname class TestEnumUnderNamespace(unittest.TestCase): -- cgit v1.2.3