diff options
439 files changed, 713 insertions, 713 deletions
diff --git a/PySide2/QtConcurrent/typesystem_concurrent.xml b/PySide2/QtConcurrent/typesystem_concurrent.xml index 83f5aca96..7df4b0f22 100644 --- a/PySide2/QtConcurrent/typesystem_concurrent.xml +++ b/PySide2/QtConcurrent/typesystem_concurrent.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtConcurrent"> +<typesystem package="PySide2.QtConcurrent"> <load-typesystem name="typesystem_core.xml" generate="no"/> <!-- Qt5: this is currently the minimum possible QtConcurrent support, by just extracting diff --git a/PySide2/QtCore/typesystem_core.xml.in b/PySide2/QtCore/typesystem_core.xml.in index 499dcdc8d..f0e894bbc 100644 --- a/PySide2/QtCore/typesystem_core.xml.in +++ b/PySide2/QtCore/typesystem_core.xml.in @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtCore"> +<typesystem package="PySide2.QtCore"> <load-typesystem name="typesystem_core_@AUTO_OS@.xml" generate="yes"/> <load-typesystem name="typesystem_core_common.xml" generate="yes"/> </typesystem> diff --git a/PySide2/QtCore/typesystem_core_common.xml b/PySide2/QtCore/typesystem_core_common.xml index 539e2137d..de6004c49 100644 --- a/PySide2/QtCore/typesystem_core_common.xml +++ b/PySide2/QtCore/typesystem_core_common.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtCore"> +<typesystem package="PySide2.QtCore"> <load-typesystem name="typesystem_templates.xml" generate="no"/> <custom-type name="str" /> @@ -547,7 +547,7 @@ <primitive-type name="QVariantMap" target-lang-api-name="PyDict"/> <inject-code class="target" position="end"> - Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QTCORE_QMAP_QSTRING_QVARIANT_IDX], "QVariantMap"); + Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QTCORE_QMAP_QSTRING_QVARIANT_IDX], "QVariantMap"); </inject-code> <inject-code class="native" position="beginning"> @@ -1002,9 +1002,9 @@ <!--signal/slot--> <inject-code class="target" position="end"> - Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], "unicode"); - Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], "str"); - Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QTCORE_QLIST_QVARIANT_IDX], "QVariantList"); + Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QSTRING_IDX], "unicode"); + Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QSTRING_IDX], "str"); + Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QTCORE_QLIST_QVARIANT_IDX], "QVariantList"); PySide::init(module); Py_AtExit(QtCoreModuleExit); @@ -4059,7 +4059,7 @@ s1.addTransition(button.clicked, s1h)</code> </modify-function> <!-- FIXME: the proper signature for this added function would be something like - addTransition(PySide.QtCore.Signal, QAbstractState*) + addTransition(PySide2.QtCore.Signal, QAbstractState*) but that depends on bug #362. --> <add-function signature="addTransition(PyObject*, QAbstractState*)" return-type="QSignalTransition*"> <modify-argument index="return"> diff --git a/PySide2/QtCore/typesystem_core_mac.xml b/PySide2/QtCore/typesystem_core_mac.xml index 003363cae..439648b98 100644 --- a/PySide2/QtCore/typesystem_core_mac.xml +++ b/PySide2/QtCore/typesystem_core_mac.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtCore"> +<typesystem package="PySide2.QtCore"> <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject" /> <!-- Qt5: had to move QAbstractEventDispatcher into os-specific files because of Windows --> <object-type name="QAbstractEventDispatcher"> diff --git a/PySide2/QtCore/typesystem_core_win.xml b/PySide2/QtCore/typesystem_core_win.xml index 6b8b20312..c0a439e5d 100644 --- a/PySide2/QtCore/typesystem_core_win.xml +++ b/PySide2/QtCore/typesystem_core_win.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtCore"> +<typesystem package="PySide2.QtCore"> <extra-includes> <include file-name="windows.h" location="global"/> </extra-includes> diff --git a/PySide2/QtCore/typesystem_core_x11.xml b/PySide2/QtCore/typesystem_core_x11.xml index 8fa3a6d2c..0fc72032e 100644 --- a/PySide2/QtCore/typesystem_core_x11.xml +++ b/PySide2/QtCore/typesystem_core_x11.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtCore"> +<typesystem package="PySide2.QtCore"> <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong"> <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type --> <!-- Qt5: XXX move this to QtGui <include file-name="QTextDocument" location="global"/> --> diff --git a/PySide2/QtDeclarative/pysideqmlregistertype.cpp b/PySide2/QtDeclarative/pysideqmlregistertype.cpp index 5b09d4673..28d10c37f 100644 --- a/PySide2/QtDeclarative/pysideqmlregistertype.cpp +++ b/PySide2/QtDeclarative/pysideqmlregistertype.cpp @@ -260,8 +260,8 @@ void propListAppender(QDeclarativeListProperty<QDeclarativeItem>* propList, QDec Shiboken::GilState state; Shiboken::AutoDecRef args(PyTuple_New(2)); - PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object)); - PyTuple_SET_ITEM(args, 1, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtDeclarativeTypes[SBK_QDECLARATIVEITEM_IDX], item)); + PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QOBJECT_IDX], propList->object)); + PyTuple_SET_ITEM(args, 1, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtDeclarativeTypes[SBK_QDECLARATIVEITEM_IDX], item)); DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data); Shiboken::AutoDecRef retVal(PyObject_CallObject(data->append, args)); @@ -276,7 +276,7 @@ int propListCount(QDeclarativeListProperty<QDeclarativeItem>* propList) Shiboken::GilState state; Shiboken::AutoDecRef args(PyTuple_New(1)); - PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object)); + PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QOBJECT_IDX], propList->object)); DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data); Shiboken::AutoDecRef retVal(PyObject_CallObject(data->count, args)); @@ -297,7 +297,7 @@ QDeclarativeItem* propListAt(QDeclarativeListProperty<QDeclarativeItem>* propLis Shiboken::GilState state; Shiboken::AutoDecRef args(PyTuple_New(2)); - PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object)); + PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QOBJECT_IDX], propList->object)); PyTuple_SET_ITEM(args, 1, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter<int>(), &index)); DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data); @@ -307,7 +307,7 @@ QDeclarativeItem* propListAt(QDeclarativeListProperty<QDeclarativeItem>* propLis if (PyErr_Occurred()) PyErr_Print(); else if (PyType_IsSubtype(Py_TYPE(retVal), data->type)) - Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QDECLARATIVEITEM_IDX], retVal, &result); + Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QDECLARATIVEITEM_IDX], retVal, &result); return result; } @@ -317,7 +317,7 @@ void propListClear(QDeclarativeListProperty<QDeclarativeItem>* propList) Shiboken::GilState state; Shiboken::AutoDecRef args(PyTuple_New(1)); - PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object)); + PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QOBJECT_IDX], propList->object)); DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data); Shiboken::AutoDecRef retVal(PyObject_CallObject(data->clear, args)); @@ -334,7 +334,7 @@ static void propListMetaCall(PySideProperty* pp, PyObject* self, QMetaObject::Ca DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(PySide::Property::userData(pp)); QObject* qobj; - Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], self, &qobj); + Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QOBJECT_IDX], self, &qobj); QDeclarativeListProperty<QDeclarativeItem> declProp(qobj, data, &propListAppender); if (data->count) diff --git a/PySide2/QtDeclarative/typesystem_declarative.xml b/PySide2/QtDeclarative/typesystem_declarative.xml index 228f7287e..d6c5022ef 100644 --- a/PySide2/QtDeclarative/typesystem_declarative.xml +++ b/PySide2/QtDeclarative/typesystem_declarative.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtDeclarative"> +<typesystem package="PySide2.QtDeclarative"> <load-typesystem name="typesystem_core.xml" generate="no"/> <load-typesystem name="typesystem_network.xml" generate="no"/> <load-typesystem name="typesystem_widgets.xml" generate="no"/> diff --git a/PySide2/QtGui/typesystem_gui.xml.in b/PySide2/QtGui/typesystem_gui.xml.in index 8c5cfa9a5..8e2d23cbd 100644 --- a/PySide2/QtGui/typesystem_gui.xml.in +++ b/PySide2/QtGui/typesystem_gui.xml.in @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide2.QtGui"> <load-typesystem name="typesystem_core.xml" generate="no"/> <load-typesystem name="typesystem_gui_@AUTO_OS@.xml" generate="yes"/> <load-typesystem name="typesystem_gui_common.xml" generate="yes"/> diff --git a/PySide2/QtGui/typesystem_gui_common.xml b/PySide2/QtGui/typesystem_gui_common.xml index 62aa03cd1..e0ddb1f0a 100644 --- a/PySide2/QtGui/typesystem_gui_common.xml +++ b/PySide2/QtGui/typesystem_gui_common.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide2.QtGui"> <load-typesystem name="typesystem_core.xml" generate="no"/> <template name="QFontCharFix"> @@ -892,7 +892,7 @@ { qreal r, g, b, a; %CPPSELF.getRgbF(&r, &g, &b, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromRgbF(%.6f, %.6f, %.6f, %.6f)", r, g, b, a); + QString repr = QString().sprintf("PySide2.QtGui.QColor.fromRgbF(%.6f, %.6f, %.6f, %.6f)", r, g, b, a); %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); break; } @@ -900,7 +900,7 @@ { qreal h, s, v, a; %CPPSELF.getHsvF(&h, &s, &v, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromHsvF(%.6f, %.6f, %.6f, %.6f)", h, s, v, a); + QString repr = QString().sprintf("PySide2.QtGui.QColor.fromHsvF(%.6f, %.6f, %.6f, %.6f)", h, s, v, a); %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); break; } @@ -908,7 +908,7 @@ { qreal c, m, y, k, a; %CPPSELF.getCmykF(&c, &m, &y, &k, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromCmykF(%.6f, %.6f, %.6f, %.6f, %.6f)", c, m, y, k, a); + QString repr = QString().sprintf("PySide2.QtGui.QColor.fromCmykF(%.6f, %.6f, %.6f, %.6f, %.6f)", c, m, y, k, a); %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); break; } @@ -917,14 +917,14 @@ { qreal h, s, l, a; %CPPSELF.getHslF(&h, &s, &l, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromHslF(%.6f, %.6f, %.6f, %.6f)", h, s, l, a); + QString repr = QString().sprintf("PySide2.QtGui.QColor.fromHslF(%.6f, %.6f, %.6f, %.6f)", h, s, l, a); %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); break; } #endif default: { - %PYARG_0 = Shiboken::String::fromCString("PySide.QtGui.QColor()"); + %PYARG_0 = Shiboken::String::fromCString("PySide2.QtGui.QColor()"); } } </template> @@ -1681,7 +1681,7 @@ } else { PyErr_Format(PyExc_TypeError, "Invalid return value in function %s, expected %s, got %s.", "QValidator.validate", - "PySide.QtGui.QValidator.State, (PySide.QtGui.QValidator.State,), (PySide.QtGui.QValidator.State, unicode) or (PySide.QtGui.QValidator.State, unicode, int)", + "PySide2.QtGui.QValidator.State, (PySide2.QtGui.QValidator.State,), (PySide2.QtGui.QValidator.State, unicode) or (PySide2.QtGui.QValidator.State, unicode, int)", pyResult->ob_type->tp_name); return QValidator::State(); } diff --git a/PySide2/QtGui/typesystem_gui_mac.xml b/PySide2/QtGui/typesystem_gui_mac.xml index a3b5e9a24..a3a48f418 100644 --- a/PySide2/QtGui/typesystem_gui_mac.xml +++ b/PySide2/QtGui/typesystem_gui_mac.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide2.QtGui"> <rejection class="*" function-name="qt_mac_set_cursor"/> <rejection class="*" function-name="macMenu"/> diff --git a/PySide2/QtGui/typesystem_gui_win.xml b/PySide2/QtGui/typesystem_gui_win.xml index b100b6738..0687b75c7 100644 --- a/PySide2/QtGui/typesystem_gui_win.xml +++ b/PySide2/QtGui/typesystem_gui_win.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide2.QtGui"> <primitive-type name="WId" target-lang-api-name="PyObject"> <conversion-rule> <native-to-target> diff --git a/PySide2/QtGui/typesystem_gui_x11.xml b/PySide2/QtGui/typesystem_gui_x11.xml index 5d70c47ec..7cbb8953b 100644 --- a/PySide2/QtGui/typesystem_gui_x11.xml +++ b/PySide2/QtGui/typesystem_gui_x11.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide2.QtGui"> <rejection class="" function-name="qt_x11_getX11InfoForWindow"/> <rejection class="QX11Info" field-name="x11data"/> diff --git a/PySide2/QtHelp/typesystem_help.xml b/PySide2/QtHelp/typesystem_help.xml index bfe506eec..a788bdf83 100644 --- a/PySide2/QtHelp/typesystem_help.xml +++ b/PySide2/QtHelp/typesystem_help.xml @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtHelp"> +<typesystem package="PySide2.QtHelp"> <load-typesystem name="typesystem_widgets.xml" generate="no" /> <value-type name="QHelpContentItem"> diff --git a/PySide2/QtMultimedia/typesystem_multimedia.xml b/PySide2/QtMultimedia/typesystem_multimedia.xml index 3dd644336..7b173090e 100644 --- a/PySide2/QtMultimedia/typesystem_multimedia.xml +++ b/PySide2/QtMultimedia/typesystem_multimedia.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtMultimedia"> +<typesystem package="PySide2.QtMultimedia"> <load-typesystem name="typesystem_core.xml" generate="no" /> <load-typesystem name="typesystem_gui.xml" generate="no" /> <load-typesystem name="typesystem_network.xml" generate="no" /> diff --git a/PySide2/QtNetwork/typesystem_network.xml b/PySide2/QtNetwork/typesystem_network.xml index c88fac9d4..ad5db74bd 100644 --- a/PySide2/QtNetwork/typesystem_network.xml +++ b/PySide2/QtNetwork/typesystem_network.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtNetwork"> +<typesystem package="PySide2.QtNetwork"> <load-typesystem name="typesystem_core.xml" generate="no"/> <namespace-type name="QSsl"> diff --git a/PySide2/QtOpenGL/typesystem_opengl.xml b/PySide2/QtOpenGL/typesystem_opengl.xml index 1988b5355..145c16713 100644 --- a/PySide2/QtOpenGL/typesystem_opengl.xml +++ b/PySide2/QtOpenGL/typesystem_opengl.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtOpenGL"> +<typesystem package="PySide2.QtOpenGL"> <load-typesystem name="typesystem_gui.xml" generate="no" /> <primitive-type name="GLbitfield"/> diff --git a/PySide2/QtPrintSupport/typesystem_printsupport.xml b/PySide2/QtPrintSupport/typesystem_printsupport.xml index 73376eae9..fb0d64a4e 100644 --- a/PySide2/QtPrintSupport/typesystem_printsupport.xml +++ b/PySide2/QtPrintSupport/typesystem_printsupport.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtPrintSupport"> +<typesystem package="PySide2.QtPrintSupport"> <load-typesystem name="typesystem_widgets.xml" generate="no" /> <object-type name="QPageSetupDialog"> diff --git a/PySide2/QtScript/typesystem_script.xml b/PySide2/QtScript/typesystem_script.xml index 9cce25e9d..2fe032c4e 100644 --- a/PySide2/QtScript/typesystem_script.xml +++ b/PySide2/QtScript/typesystem_script.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtScript"> +<typesystem package="PySide2.QtScript"> <load-typesystem name="typesystem_core.xml" generate="no" /> <object-type name="QScriptable"/> diff --git a/PySide2/QtScriptTools/typesystem_scripttools.xml b/PySide2/QtScriptTools/typesystem_scripttools.xml index 67b515c6f..ea3e3dcdc 100644 --- a/PySide2/QtScriptTools/typesystem_scripttools.xml +++ b/PySide2/QtScriptTools/typesystem_scripttools.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtScriptTools"> +<typesystem package="PySide2.QtScriptTools"> <load-typesystem name="typesystem_script.xml" generate="no" /> <load-typesystem name="typesystem_gui.xml" generate="no" /> diff --git a/PySide2/QtSql/typesystem_sql.xml b/PySide2/QtSql/typesystem_sql.xml index 34ae52b2b..98db07825 100644 --- a/PySide2/QtSql/typesystem_sql.xml +++ b/PySide2/QtSql/typesystem_sql.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtSql"> +<typesystem package="PySide2.QtSql"> <load-typesystem name="typesystem_widgets.xml" generate="no"/> <rejection class="QSqlDriverCreator"/> diff --git a/PySide2/QtSvg/typesystem_svg.xml b/PySide2/QtSvg/typesystem_svg.xml index 58ab812fc..13b9851b8 100644 --- a/PySide2/QtSvg/typesystem_svg.xml +++ b/PySide2/QtSvg/typesystem_svg.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtSvg"> +<typesystem package="PySide2.QtSvg"> <load-typesystem name="typesystem_widgets.xml" generate="no"/> <object-type name="QSvgRenderer" /> diff --git a/PySide2/QtTest/typesystem_test.xml b/PySide2/QtTest/typesystem_test.xml index 6e2c5bf19..bda8d82d6 100644 --- a/PySide2/QtTest/typesystem_test.xml +++ b/PySide2/QtTest/typesystem_test.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtTest"> +<typesystem package="PySide2.QtTest"> <load-typesystem name="typesystem_core.xml" generate="no"/> <load-typesystem name="typesystem_gui.xml" generate="no"/> <load-typesystem name="typesystem_widgets.xml" generate="no"/> diff --git a/PySide2/QtUiTools/typesystem_uitools.xml b/PySide2/QtUiTools/typesystem_uitools.xml index 16039c9ec..5b41878b9 100644 --- a/PySide2/QtUiTools/typesystem_uitools.xml +++ b/PySide2/QtUiTools/typesystem_uitools.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtUiTools"> +<typesystem package="PySide2.QtUiTools"> <load-typesystem name="typesystem_widgets.xml" generate="no" /> <load-typesystem name="typesystem_xml.xml" generate="no" /> @@ -45,7 +45,7 @@ <http://www.pyside.org/docs/shiboken/wordsofadvice.html#duck-punching-and-virtual-methods>`_) Let's see an obvious example. If you want to create a new widget it's probable you'll end up - overriding :class:`~PySide.QtGui.QWidget`'s :meth:`~PySide.QtGui.QWidget.paintEvent` method. + overriding :class:`~PySide2.QtGui.QWidget`'s :meth:`~PySide2.QtGui.QWidget.paintEvent` method. .. code-block:: python diff --git a/PySide2/QtWebKit/typesystem_webkit.xml b/PySide2/QtWebKit/typesystem_webkit.xml index 84b82aaed..2e7c1b144 100644 --- a/PySide2/QtWebKit/typesystem_webkit.xml +++ b/PySide2/QtWebKit/typesystem_webkit.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtWebKit"> +<typesystem package="PySide2.QtWebKit"> <load-typesystem name="typesystem_core.xml" generate="no"/> <load-typesystem name="typesystem_gui.xml" generate="no"/> <load-typesystem name="typesystem_network.xml" generate="no"/> diff --git a/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml b/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml index e4e4f05b6..9b1cf396d 100644 --- a/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml +++ b/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtWebKitWidgets"> +<typesystem package="PySide2.QtWebKitWidgets"> <load-typesystem name="typesystem_core.xml" generate="no"/> <load-typesystem name="typesystem_gui.xml" generate="no"/> <load-typesystem name="typesystem_widgets.xml" generate="no"/> diff --git a/PySide2/QtWidgets/typesystem_widgets.xml.in b/PySide2/QtWidgets/typesystem_widgets.xml.in index c7538dbcc..b0dd1948e 100644 --- a/PySide2/QtWidgets/typesystem_widgets.xml.in +++ b/PySide2/QtWidgets/typesystem_widgets.xml.in @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtWidgets"> +<typesystem package="PySide2.QtWidgets"> <load-typesystem name="typesystem_gui.xml" generate="no"/> <load-typesystem name="typesystem_widgets_@AUTO_OS@.xml" generate="yes"/> <load-typesystem name="typesystem_widgets_common.xml" generate="yes"/> diff --git a/PySide2/QtWidgets/typesystem_widgets_common.xml b/PySide2/QtWidgets/typesystem_widgets_common.xml index 0362a691d..0e1263376 100644 --- a/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtWidgets"> +<typesystem package="PySide2.QtWidgets"> <load-typesystem name="typesystem_gui.xml" generate="no"/> diff --git a/PySide2/QtWidgets/typesystem_widgets_mac.xml b/PySide2/QtWidgets/typesystem_widgets_mac.xml index fbb1220b1..a51959e01 100644 --- a/PySide2/QtWidgets/typesystem_widgets_mac.xml +++ b/PySide2/QtWidgets/typesystem_widgets_mac.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtWidgets"> +<typesystem package="PySide2.QtWidgets"> <rejection class="*" function-name="qt_mac_set_cursor"/> <rejection class="*" function-name="macMenu"/> diff --git a/PySide2/QtWidgets/typesystem_widgets_win.xml b/PySide2/QtWidgets/typesystem_widgets_win.xml index 8521789c7..88a0b95b1 100644 --- a/PySide2/QtWidgets/typesystem_widgets_win.xml +++ b/PySide2/QtWidgets/typesystem_widgets_win.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtWidgets"> +<typesystem package="PySide2.QtWidgets"> <primitive-type name="WId" target-lang-api-name="PyObject"> <conversion-rule> <native-to-target> diff --git a/PySide2/QtWidgets/typesystem_widgets_x11.xml b/PySide2/QtWidgets/typesystem_widgets_x11.xml index ca56332e7..94c1a64b9 100644 --- a/PySide2/QtWidgets/typesystem_widgets_x11.xml +++ b/PySide2/QtWidgets/typesystem_widgets_x11.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtWidgets"> +<typesystem package="PySide2.QtWidgets"> <rejection class="" function-name="qt_x11_getX11InfoForWindow"/> <rejection class="QX11Info" field-name="x11data"/> diff --git a/PySide2/QtXml/typesystem_xml.xml b/PySide2/QtXml/typesystem_xml.xml index feab9b1f8..f84adee95 100644 --- a/PySide2/QtXml/typesystem_xml.xml +++ b/PySide2/QtXml/typesystem_xml.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtXml"> +<typesystem package="PySide2.QtXml"> <load-typesystem name="typesystem_templates.xml" generate="no" /> <load-typesystem name="typesystem_core.xml" generate="no" /> diff --git a/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml b/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml index 34488fabe..0b859c3d5 100644 --- a/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml +++ b/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtXmlPatterns"> +<typesystem package="PySide2.QtXmlPatterns"> <load-typesystem name="typesystem_core.xml" generate="no"/> <object-type name="QXmlSchema" since="4.6" /> <!-- Qt scoped pointer does not allow declare this as value type --> diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake index b27229c32..c01695cb3 100644 --- a/cmake/Macros/PySideModules.cmake +++ b/cmake/Macros/PySideModules.cmake @@ -77,7 +77,7 @@ macro(create_pyside_module # install install(TARGETS ${module_name} LIBRARY DESTINATION ${SITE_PACKAGE}/PySide2) string(TOLOWER ${module_name} lower_module_name) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module_name}/pyside_${lower_module_name}_python.h + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide2/${module_name}/pyside2_${lower_module_name}_python.h DESTINATION include/PySide2${pyside2_SUFFIX}/${module_name}/) file(GLOB typesystem_files ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_*.xml ${typesystem_path}) install(FILES ${typesystem_files} DESTINATION share/PySide2${pyside2_SUFFIX}/typesystems) @@ -148,7 +148,7 @@ endmacro() macro(HAS_QT_MODULE var name) if (NOT DISABLE_${name} AND ${var}) # we keep the PySide name here because this is compiled into shiboken - set(${name}_GEN_DIR ${CMAKE_CURRENT_BINARY_DIR}/${name}/PySide/${name} + set(${name}_GEN_DIR ${CMAKE_CURRENT_BINARY_DIR}/${name}/PySide2/${name} CACHE INTERNAL "dir with generated source" FORCE) add_subdirectory(${name}) else() diff --git a/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp b/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp index bf76ce161..e5a223546 100644 --- a/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp +++ b/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp @@ -39,7 +39,7 @@ ## ############################################################################ -form PySide.QtGui import * +form PySide2.QtGui import * def __init__(self, parent): diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp index bb646a105..3fa7e48f0 100644 --- a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp +++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp @@ -1,5 +1,5 @@ //! [0] -from PySide.QtCore import QApplication, QTimer +from PySide2.QtCore import QApplication, QTimer def main(): diff --git a/doc/codesnippets/doc/src/snippets/code/src_opengl_qglcolormap.cpp b/doc/codesnippets/doc/src/snippets/code/src_opengl_qglcolormap.cpp index 804741221..3896cd66c 100644 --- a/doc/codesnippets/doc/src/snippets/code/src_opengl_qglcolormap.cpp +++ b/doc/codesnippets/doc/src/snippets/code/src_opengl_qglcolormap.cpp @@ -1,8 +1,8 @@ //! [0] import sys -from PySide.QtGui import QApplication, qRgb -from PySide.QtOpenGL import QGLColormap +from PySide2.QtGui import QApplication, qRgb +from PySide2.QtOpenGL import QGLColormap def main(argv): app = QApplication(argv) diff --git a/doc/codesnippets/doc/src/snippets/droparea.cpp b/doc/codesnippets/doc/src/snippets/droparea.cpp index 461737167..a89e22d9a 100644 --- a/doc/codesnippets/doc/src/snippets/droparea.cpp +++ b/doc/codesnippets/doc/src/snippets/droparea.cpp @@ -37,7 +37,7 @@ ## ############################################################################/ -from PySide.QtGui import * +from PySide2.QtGui import * DropArea.DropArea(QWidget *parent) diff --git a/doc/codesnippets/doc/src/snippets/myscrollarea.cpp b/doc/codesnippets/doc/src/snippets/myscrollarea.cpp index d8b1bf3c4..61c954270 100644 --- a/doc/codesnippets/doc/src/snippets/myscrollarea.cpp +++ b/doc/codesnippets/doc/src/snippets/myscrollarea.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -from PySide.QtCore import * -from PySide.QtGui import * +from PySide2.QtCore import * +from PySide2.QtGui import * import sys class MyScrollArea (QAbstractScrollArea): diff --git a/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp b/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp index d433fc29b..eef9a1948 100644 --- a/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp +++ b/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -from PySide.QtGui import * -from PySide.QtNetwork import QTcpSocket +from PySide2.QtGui import * +from PySide2.QtNetwork import QTcpSocket def main(): app = QCoreApplication() diff --git a/doc/codesnippets/doc/src/snippets/qdir-listfiles/main.cpp b/doc/codesnippets/doc/src/snippets/qdir-listfiles/main.cpp index 6c8fbcf25..10ba04a24 100644 --- a/doc/codesnippets/doc/src/snippets/qdir-listfiles/main.cpp +++ b/doc/codesnippets/doc/src/snippets/qdir-listfiles/main.cpp @@ -41,7 +41,7 @@ //! [0] -from PySide.QtCore import QDir, QCoreApplication +from PySide2.QtCore import QDir, QCoreApplication import sys app = QCoreApplication(sys.argv) diff --git a/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp b/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp index 163134da2..125731991 100644 --- a/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp +++ b/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -from PySide.QtCore import * +from PySide2.QtCore import * def main(): dir_ = QDir() diff --git a/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp b/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp index d26da7562..c0af622b3 100644 --- a/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp +++ b/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp @@ -45,7 +45,7 @@ void startProcess() { //! [0] import re -from PySide.QtCore import QProcess +from PySide2.QtCore import QProcess process = QProcess() diff --git a/doc/codesnippets/doc/src/snippets/scribe-overview/main.cpp b/doc/codesnippets/doc/src/snippets/scribe-overview/main.cpp index a5201412a..7b53dcdf4 100644 --- a/doc/codesnippets/doc/src/snippets/scribe-overview/main.cpp +++ b/doc/codesnippets/doc/src/snippets/scribe-overview/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtWidgets> -from PySide.QtGui import * +from PySide2.QtGui import * # edit : QTextEdit def mergeFormat(edit): diff --git a/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp b/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp index bbaf93512..9837f4144 100644 --- a/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp +++ b/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp @@ -46,7 +46,7 @@ selection model. """ -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] //! [1] diff --git a/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp b/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp index 89cece62d..6374b287d 100644 --- a/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp +++ b/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp @@ -39,8 +39,8 @@ # ###################################### -from PySide.QtGui import * -from PySide.QtSql import * +from PySide2.QtGui import * +from PySide2.QtSql import * def tr(text): diff --git a/doc/codesnippets/doc/src/snippets/timers/timers.cpp b/doc/codesnippets/doc/src/snippets/timers/timers.cpp index 918ba74a8..0adfa8909 100644 --- a/doc/codesnippets/doc/src/snippets/timers/timers.cpp +++ b/doc/codesnippets/doc/src/snippets/timers/timers.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -from PySide.QtCore import QTimer +from PySide2.QtCore import QTimer class Foo : public QObject { diff --git a/doc/codesnippets/doc/src/snippets/webkit/webpage/main.cpp b/doc/codesnippets/doc/src/snippets/webkit/webpage/main.cpp index 239309e65..19674ff15 100644 --- a/doc/codesnippets/doc/src/snippets/webkit/webpage/main.cpp +++ b/doc/codesnippets/doc/src/snippets/webkit/webpage/main.cpp @@ -1,7 +1,7 @@ -from PySide.QtGui import * -from PySide.QWebKit import QWebPage -from PySide.QWebKit import QWebFrame +from PySide2.QtGui import * +from PySide2.QWebKit import QWebPage +from PySide2.QWebKit import QWebFrame //! [0] diff --git a/doc/codesnippets/examples/dbus/example-client.py b/doc/codesnippets/examples/dbus/example-client.py index 605d4b452..6c38c7b1e 100755 --- a/doc/codesnippets/examples/dbus/example-client.py +++ b/doc/codesnippets/examples/dbus/example-client.py @@ -11,7 +11,7 @@ import dbus # import python dbus GLib mainloop support import dbus.mainloop.glib # import QtCore -from PySide.QtCore import * +from PySide2.QtCore import * # signal handler def button_clicked(): diff --git a/doc/codesnippets/examples/dbus/example-server.py b/doc/codesnippets/examples/dbus/example-server.py index 3f51ef501..4eab67cc7 100755 --- a/doc/codesnippets/examples/dbus/example-server.py +++ b/doc/codesnippets/examples/dbus/example-server.py @@ -8,8 +8,8 @@ import dbus.service import dbus.mainloop.glib import random -from PySide.QtCore import * -from PySide.QtGui import QPushButton, QApplication +from PySide2.QtCore import * +from PySide2.QtGui import QPushButton, QApplication # The adaptor, MUST inherit dbus.service.Object class DBusWidget(dbus.service.Object): diff --git a/doc/codesnippets/examples/dialogs/extension/finddialog.cpp b/doc/codesnippets/examples/dialogs/extension/finddialog.cpp index 70a9984f1..729c37783 100644 --- a/doc/codesnippets/examples/dialogs/extension/finddialog.cpp +++ b/doc/codesnippets/examples/dialogs/extension/finddialog.cpp @@ -40,7 +40,7 @@ ############################################################################ -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] def __init__(self, parent): diff --git a/doc/codesnippets/examples/linguist/hellotr/main.cpp b/doc/codesnippets/examples/linguist/hellotr/main.cpp index 32914ce16..1ac29348a 100644 --- a/doc/codesnippets/examples/linguist/hellotr/main.cpp +++ b/doc/codesnippets/examples/linguist/hellotr/main.cpp @@ -42,7 +42,7 @@ #include <QApplication> #include <QPushButton> //! [0] -from PySide.QtCore import QTranslator +from PySide2.QtCore import QTranslator //! [0] //! [1] //! [2] diff --git a/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp b/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp index 73b469b7c..67a2886f2 100644 --- a/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp +++ b/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp @@ -40,7 +40,7 @@ ###################################### //! [0] -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] //! [1] diff --git a/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp b/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp index aac0e25f9..4d0de73fa 100644 --- a/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp +++ b/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp @@ -40,7 +40,7 @@ ############################################################################ //! [0] -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] //! [1] diff --git a/doc/codesnippets/examples/mainwindows/mainwindow.cpp b/doc/codesnippets/examples/mainwindows/mainwindow.cpp index bf33d9f69..aa892bb27 100644 --- a/doc/codesnippets/examples/mainwindows/mainwindow.cpp +++ b/doc/codesnippets/examples/mainwindows/mainwindow.cpp @@ -39,7 +39,7 @@ # ###################################### -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] def __init__(self): diff --git a/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp b/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp index 985bcfaa0..15015efcc 100644 --- a/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp +++ b/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp @@ -39,7 +39,7 @@ ## ############################################################################ -from PySide.QtGui import * +from PySide2.QtGui import * def __init__(self): diff --git a/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp b/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp index bf33d9f69..aa892bb27 100644 --- a/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp +++ b/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp @@ -39,7 +39,7 @@ # ###################################### -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] def __init__(self): diff --git a/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp b/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp index 170902e63..ea33baf53 100644 --- a/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp +++ b/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp @@ -39,8 +39,8 @@ # ###################################### -from PySide.QtGui import * -from PySide.QtSql import * +from PySide2.QtGui import * +from PySide2.QtSql import * def initializeModel(model): //! [0] diff --git a/doc/codesnippets/examples/widgets/spinboxes/window.cpp b/doc/codesnippets/examples/widgets/spinboxes/window.cpp index aa1db7173..626fdb122 100644 --- a/doc/codesnippets/examples/widgets/spinboxes/window.cpp +++ b/doc/codesnippets/examples/widgets/spinboxes/window.cpp @@ -39,7 +39,7 @@ # ###################################### -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] def __init__(self): diff --git a/doc/codesnippets/snippets/customstyle/main.cpp b/doc/codesnippets/snippets/customstyle/main.cpp index a1ac4acaa..3fac5293c 100644 --- a/doc/codesnippets/snippets/customstyle/main.cpp +++ b/doc/codesnippets/snippets/customstyle/main.cpp @@ -1,7 +1,7 @@ //! [using a custom style] import sys -from PySide.QtGui import * +from PySide2.QtGui import * QApplication.setStyle(CustomStyle()) app = QApplication(sys.argv) diff --git a/doc/codesnippets/webkitsnippets/simple/main.cpp b/doc/codesnippets/webkitsnippets/simple/main.cpp index 3a90db9ac..d10da4eb1 100644 --- a/doc/codesnippets/webkitsnippets/simple/main.cpp +++ b/doc/codesnippets/webkitsnippets/simple/main.cpp @@ -1,7 +1,7 @@ -from PySide.QtCore import * -from PySide.QtGui import * -from PySide.QtWebKit import * +from PySide2.QtCore import * +from PySide2.QtGui import * +from PySide2.QtWebKit import * import sys app = QApplication(sys.argv) diff --git a/doc/extras/PySide.QtCore.ClassInfo.rst b/doc/extras/PySide.QtCore.ClassInfo.rst index 39edf3f60..d2267be9c 100644 --- a/doc/extras/PySide.QtCore.ClassInfo.rst +++ b/doc/extras/PySide.QtCore.ClassInfo.rst @@ -1,4 +1,4 @@ -.. module:: PySide.QtCore +.. module:: PySide2.QtCore .. _ClassInfo: ClassInfo diff --git a/doc/extras/PySide.QtCore.Signal.rst b/doc/extras/PySide.QtCore.Signal.rst index b4c4e3667..16c640831 100644 --- a/doc/extras/PySide.QtCore.Signal.rst +++ b/doc/extras/PySide.QtCore.Signal.rst @@ -1,4 +1,4 @@ -.. module:: PySide.QtCore +.. module:: PySide2.QtCore .. _Signal: Signal diff --git a/doc/extras/PySide.QtCore.Slot.rst b/doc/extras/PySide.QtCore.Slot.rst index 307c2299e..6b93014cf 100644 --- a/doc/extras/PySide.QtCore.Slot.rst +++ b/doc/extras/PySide.QtCore.Slot.rst @@ -1,4 +1,4 @@ -.. module:: PySide.QtCore +.. module:: PySide2.QtCore .. _Slot: Slot diff --git a/doc/extras/PySide.QtCore.rst b/doc/extras/PySide.QtCore.rst index f9e05d248..d3277a418 100644 --- a/doc/extras/PySide.QtCore.rst +++ b/doc/extras/PySide.QtCore.rst @@ -2,4 +2,4 @@ All other Qt modules rely on this module. To include the definitions of the modu :: - import PySide.QtCore + import PySide2.QtCore diff --git a/doc/extras/PySide.QtDeclarative.ListProperty.rst b/doc/extras/PySide.QtDeclarative.ListProperty.rst index dcbd57f2d..d32621a46 100644 --- a/doc/extras/PySide.QtDeclarative.ListProperty.rst +++ b/doc/extras/PySide.QtDeclarative.ListProperty.rst @@ -1,4 +1,4 @@ -.. module:: PySide.QtDeclarative +.. module:: PySide2.QtDeclarative .. _ListProperty: ListProperty diff --git a/doc/extras/PySide.QtDeclarative.rst b/doc/extras/PySide.QtDeclarative.rst index 4b94adc76..cb4cc42c2 100644 --- a/doc/extras/PySide.QtDeclarative.rst +++ b/doc/extras/PySide.QtDeclarative.rst @@ -2,4 +2,4 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtDeclarative + import PySide2.QtDeclarative diff --git a/doc/extras/PySide.QtGui.rst b/doc/extras/PySide.QtGui.rst index f575c2f23..e16329c38 100644 --- a/doc/extras/PySide.QtGui.rst +++ b/doc/extras/PySide.QtGui.rst @@ -2,6 +2,6 @@ To include the definitions of modules classes, use the following directive: :: - import PySide.QtGui + import PySide2.QtGui -.. seealso:: :mod:`PySide.QtCore` +.. seealso:: :mod:`PySide2.QtCore` diff --git a/doc/extras/PySide.QtHelp.rst b/doc/extras/PySide.QtHelp.rst index 8332f57db..6ecfc3d97 100644 --- a/doc/extras/PySide.QtHelp.rst +++ b/doc/extras/PySide.QtHelp.rst @@ -2,7 +2,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtHelp + import PySide2.QtHelp License Information ------------------- diff --git a/doc/extras/PySide.QtMultimedia.rst b/doc/extras/PySide.QtMultimedia.rst index 540a7061b..5088db4d0 100644 --- a/doc/extras/PySide.QtMultimedia.rst +++ b/doc/extras/PySide.QtMultimedia.rst @@ -2,6 +2,6 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtMultimedia + import PySide2.QtMultimedia diff --git a/doc/extras/PySide.QtNetwork.rst b/doc/extras/PySide.QtNetwork.rst index 44249d30f..07303b157 100644 --- a/doc/extras/PySide.QtNetwork.rst +++ b/doc/extras/PySide.QtNetwork.rst @@ -2,4 +2,4 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtNetwork + import PySide2.QtNetwork diff --git a/doc/extras/PySide.QtOpenGL.rst b/doc/extras/PySide.QtOpenGL.rst index 1758ee0af..38783d9fd 100644 --- a/doc/extras/PySide.QtOpenGL.rst +++ b/doc/extras/PySide.QtOpenGL.rst @@ -7,7 +7,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtOpenGL + import PySide2.QtOpenGL The Qt OpenGL module is implemented as a platform-independent wrapper around the platform-dependent GLX (version 1.3 or later), WGL, or AGL C APIs. Although the basic functionality provided is very similar to Mark Kilgard's GLUT library, applications using the Qt OpenGL module can take advantage of the whole Qt API for non-OpenGL-specific GUI functionality. diff --git a/doc/extras/PySide.QtScript.rst b/doc/extras/PySide.QtScript.rst index 00488cbeb..8ce7681ec 100644 --- a/doc/extras/PySide.QtScript.rst +++ b/doc/extras/PySide.QtScript.rst @@ -4,7 +4,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtScript + import PySide2.QtScript License Information ------------------- diff --git a/doc/extras/PySide.QtScriptTools.rst b/doc/extras/PySide.QtScriptTools.rst index c3f690744..a54ed914b 100644 --- a/doc/extras/PySide.QtScriptTools.rst +++ b/doc/extras/PySide.QtScriptTools.rst @@ -2,4 +2,4 @@ Applications that use the Qt Script Tools classes need to be configured to be bu :: - import PySide.QtScriptTools + import PySide2.QtScriptTools diff --git a/doc/extras/PySide.QtSql.rst b/doc/extras/PySide.QtSql.rst index 41c1794f5..fcdd6ba02 100644 --- a/doc/extras/PySide.QtSql.rst +++ b/doc/extras/PySide.QtSql.rst @@ -2,4 +2,4 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtSql + import PySide2.QtSql diff --git a/doc/extras/PySide.QtSvg.rst b/doc/extras/PySide.QtSvg.rst index b10645237..d77846550 100644 --- a/doc/extras/PySide.QtSvg.rst +++ b/doc/extras/PySide.QtSvg.rst @@ -2,7 +2,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtSvg + import PySide2.QtSvg License Information ------------------- diff --git a/doc/extras/PySide.QtTest.rst b/doc/extras/PySide.QtTest.rst index d5963cb5a..0b89a22d4 100644 --- a/doc/extras/PySide.QtTest.rst +++ b/doc/extras/PySide.QtTest.rst @@ -2,6 +2,6 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtTest + import PySide2.QtTest .. note:: All macros in the C++ version of QtTest were not binded in PySide, this module is useful only for GUI testing and benchmarking, for ordinary unit testing you should use the ``unittest`` Python module. diff --git a/doc/extras/PySide.QtUiTools.rst b/doc/extras/PySide.QtUiTools.rst index c8558f2d1..553224527 100644 --- a/doc/extras/PySide.QtUiTools.rst +++ b/doc/extras/PySide.QtUiTools.rst @@ -1,6 +1,6 @@ These forms are processed at run-time to produce dynamically-generated user interfaces. In order to generate a form at run-time, a resource file containing a UI file is needed. -A form loader object, provided by the QUiLoader class, is used to construct the user interface. This user interface can be retrieved from any QIODevice; for example, a QFile object can be used to obtain a form stored in a project's resources. The :meth:`PySide.QtUiTools.QUiLoader.load` function takes the user interface description contained in the file and constructs the form widget. +A form loader object, provided by the QUiLoader class, is used to construct the user interface. This user interface can be retrieved from any QIODevice; for example, a QFile object can be used to obtain a form stored in a project's resources. The :meth:`PySide2.QtUiTools.QUiLoader.load` function takes the user interface description contained in the file and constructs the form widget. To include the definitions of the module's classes, use the following directive: diff --git a/doc/extras/PySide.QtWebKit.rst b/doc/extras/PySide.QtWebKit.rst index 7a165be8c..58f9230a7 100644 --- a/doc/extras/PySide.QtWebKit.rst +++ b/doc/extras/PySide.QtWebKit.rst @@ -15,7 +15,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtWebKit + import PySide2.QtWebKit .. note:: Web site icons, also known as "FavIcons", are currently not supported on Windows. We plan to address this in a future release. diff --git a/doc/extras/PySide.QtXml.rst b/doc/extras/PySide.QtXml.rst index ba69e5090..4b48ef21e 100644 --- a/doc/extras/PySide.QtXml.rst +++ b/doc/extras/PySide.QtXml.rst @@ -2,4 +2,4 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtXml + import PySide2.QtXml diff --git a/doc/extras/PySide.QtXmlPatterns.rst b/doc/extras/PySide.QtXmlPatterns.rst index 0431aaf7c..3830efb4d 100644 --- a/doc/extras/PySide.QtXmlPatterns.rst +++ b/doc/extras/PySide.QtXmlPatterns.rst @@ -2,7 +2,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtXmlPatterns + import PySide2.QtXmlPatterns Further Reading --------------- diff --git a/doc/pysideapi2.rst b/doc/pysideapi2.rst index 48f87c3ad..e86be05c9 100644 --- a/doc/pysideapi2.rst +++ b/doc/pysideapi2.rst @@ -20,7 +20,7 @@ your code will run on both bindings. __hash__() function return value ================================ -The hash value returned for the classes :class:`PySide.QtCore.QDate`, :class:`PySide.QtCore.QDateTime`, :class:`PySide.QtCore.QTime`, :class:`PySide.QtCore.QUrl` will be +The hash value returned for the classes :class:`PySide2.QtCore.QDate`, :class:`PySide2.QtCore.QDateTime`, :class:`PySide2.QtCore.QTime`, :class:`PySide2.QtCore.QUrl` will be based on their string representations, thus objects with the same value will produce the same hash. diff --git a/doc/pysideversion.rst b/doc/pysideversion.rst index 23666b8ed..3bcebe0da 100644 --- a/doc/pysideversion.rst +++ b/doc/pysideversion.rst @@ -17,15 +17,15 @@ PySide exports their version numbers among the version of Qt used to compile PyS # Prints the Qt version used to compile PySide # e.g. "4.7.2" - print PySide.QtCore.__version__ + print PySide2.QtCore.__version__ # Gets a tuple with each version components of Qt used to compile PySide # e.g. (4, 7, 2) - print PySide.QtCore.__version_info__ + print PySide2.QtCore.__version_info__ Note that the Qt version used to compile PySide may differ from the version used to run PySide, to get the current running Qt version you can do: :: - print PySide.QtCore.qVersion() + print PySide2.QtCore.qVersion() diff --git a/libpyside/pysidesignal.cpp b/libpyside/pysidesignal.cpp index 69f034cb4..c188524da 100644 --- a/libpyside/pysidesignal.cpp +++ b/libpyside/pysidesignal.cpp @@ -77,7 +77,7 @@ static PyMethodDef Signal_methods[] = { PyTypeObject PySideSignalMetaType = { PyVarObject_HEAD_INIT(0, 0) - /*tp_name*/ "PySide.QtCore.MetaSignal", + /*tp_name*/ "PySide2.QtCore.MetaSignal", /*tp_basicsize*/ sizeof(PyTypeObject), /*tp_itemsize*/ 0, /*tp_dealloc*/ 0, @@ -111,7 +111,7 @@ PyTypeObject PySideSignalMetaType = { PyTypeObject PySideSignalType = { PyVarObject_HEAD_INIT(&PySideSignalMetaType, 0) - /*tp_name*/ "PySide.QtCore." SIGNAL_CLASS_NAME, + /*tp_name*/ "PySide2.QtCore." SIGNAL_CLASS_NAME, /*tp_basicsize*/ sizeof(PySideSignal), /*tp_itemsize*/ 0, /*tp_dealloc*/ 0, @@ -173,7 +173,7 @@ static PyMappingMethods SignalInstance_as_mapping = { PyTypeObject PySideSignalInstanceType = { PyVarObject_HEAD_INIT(0, 0) - /*tp_name*/ "PySide.QtCore." SIGNAL_INSTANCE_NAME, + /*tp_name*/ "PySide2.QtCore." SIGNAL_INSTANCE_NAME, /*tp_basicsize*/ sizeof(PySideSignalInstance), /*tp_itemsize*/ 0, /*tp_dealloc*/ 0, @@ -944,7 +944,7 @@ bool isQtSignal(const char* signal) bool checkQtSignal(const char* signal) { if (!isQtSignal(signal)) { - PyErr_SetString(PyExc_TypeError, "Use the function PySide.QtCore.SIGNAL on signals"); + PyErr_SetString(PyExc_TypeError, "Use the function PySide2.QtCore.SIGNAL on signals"); return false; } return true; diff --git a/libpyside/pysideslot.cpp b/libpyside/pysideslot.cpp index 223d37ec9..e83b90eb0 100644 --- a/libpyside/pysideslot.cpp +++ b/libpyside/pysideslot.cpp @@ -47,7 +47,7 @@ static PyObject* slotCall(PyObject*, PyObject*, PyObject*); // Class Definition ----------------------------------------------- static PyTypeObject PySideSlotType = { PyVarObject_HEAD_INIT(0, 0) - "PySide.QtCore." SLOT_DEC_NAME, /*tp_name*/ + "PySide2.QtCore." SLOT_DEC_NAME, /*tp_name*/ sizeof(PySideSlot), /*tp_basicsize*/ 0, /*tp_itemsize*/ 0, /*tp_dealloc*/ diff --git a/tests/QtCore/blocking_signals_test.py b/tests/QtCore/blocking_signals_test.py index 96582f6cc..d536706e3 100644 --- a/tests/QtCore/blocking_signals_test.py +++ b/tests/QtCore/blocking_signals_test.py @@ -5,7 +5,7 @@ import unittest import os from tempfile import mkstemp -from PySide.QtCore import QObject, SIGNAL, QFile +from PySide2.QtCore import QObject, SIGNAL, QFile class TestSignalsBlockedBasic(unittest.TestCase): '''Basic test case for signalsBlocked''' diff --git a/tests/QtCore/bug_1019.py b/tests/QtCore/bug_1019.py index b7f1f68f7..c2f8eda61 100644 --- a/tests/QtCore/bug_1019.py +++ b/tests/QtCore/bug_1019.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class MyTimer (QTimer): def __init__(self): diff --git a/tests/QtCore/bug_1031.py b/tests/QtCore/bug_1031.py index b97452543..c5ea315f1 100644 --- a/tests/QtCore/bug_1031.py +++ b/tests/QtCore/bug_1031.py @@ -1,4 +1,4 @@ -from PySide.QtCore import QStateMachine, QState +from PySide2.QtCore import QStateMachine, QState mach = QStateMachine() state = QState(mach) diff --git a/tests/QtCore/bug_408.py b/tests/QtCore/bug_408.py index 5827e56d6..1582be3ba 100644 --- a/tests/QtCore/bug_408.py +++ b/tests/QtCore/bug_408.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class MyDevice(QIODevice): def __init__(self, txt): diff --git a/tests/QtCore/bug_428.py b/tests/QtCore/bug_428.py index 9816b3e92..204238a8c 100644 --- a/tests/QtCore/bug_428.py +++ b/tests/QtCore/bug_428.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import QObject +from PySide2.QtCore import QObject class MyBaseObject(QObject): def __init__(self, number): diff --git a/tests/QtCore/bug_462.py b/tests/QtCore/bug_462.py index 47ab57a65..47b2f012d 100644 --- a/tests/QtCore/bug_462.py +++ b/tests/QtCore/bug_462.py @@ -1,7 +1,7 @@ import unittest import sys -from PySide.QtCore import QObject, QCoreApplication, QEvent, QThread +from PySide2.QtCore import QObject, QCoreApplication, QEvent, QThread class MyEvent(QEvent): def __init__(self,i): diff --git a/tests/QtCore/bug_505.py b/tests/QtCore/bug_505.py index 5fbaa4fe0..d00af42f2 100644 --- a/tests/QtCore/bug_505.py +++ b/tests/QtCore/bug_505.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import QObject +from PySide2.QtCore import QObject class MyBaseObject(QObject): def __init__(self, parent=None): diff --git a/tests/QtCore/bug_606.py b/tests/QtCore/bug_606.py index 219b8d99b..09c959390 100644 --- a/tests/QtCore/bug_606.py +++ b/tests/QtCore/bug_606.py @@ -1,9 +1,9 @@ import unittest import PySide -from PySide.QtCore import QPoint, QPointF -from PySide.QtCore import QLine, QLineF -from PySide.QtCore import QSize, QSizeF +from PySide2.QtCore import QPoint, QPointF +from PySide2.QtCore import QLine, QLineF +from PySide2.QtCore import QSize, QSizeF class testCases(unittest.TestCase): def testQPointToTuple(self): diff --git a/tests/QtCore/bug_656.py b/tests/QtCore/bug_656.py index ba5617447..69b636b9c 100644 --- a/tests/QtCore/bug_656.py +++ b/tests/QtCore/bug_656.py @@ -1,4 +1,4 @@ -from PySide.QtCore import * +from PySide2.QtCore import * class CoreApp(QCoreApplication): def __init__(self,*args): diff --git a/tests/QtCore/bug_686.py b/tests/QtCore/bug_686.py index 984e00712..39a621541 100644 --- a/tests/QtCore/bug_686.py +++ b/tests/QtCore/bug_686.py @@ -1,7 +1,7 @@ from __future__ import with_statement import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class MyWriteThread(QThread): def __init__(self, lock): diff --git a/tests/QtCore/bug_699.py b/tests/QtCore/bug_699.py index e731b5be2..c80db18e0 100644 --- a/tests/QtCore/bug_699.py +++ b/tests/QtCore/bug_699.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class TestBug699 (unittest.TestCase): diff --git a/tests/QtCore/bug_706.py b/tests/QtCore/bug_706.py index 18250290d..ac290d12c 100644 --- a/tests/QtCore/bug_706.py +++ b/tests/QtCore/bug_706.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class MyModel (QAbstractListModel): def rowCount(self, parent = None): diff --git a/tests/QtCore/bug_723.py b/tests/QtCore/bug_723.py index 5bffe5618..aae2b640f 100644 --- a/tests/QtCore/bug_723.py +++ b/tests/QtCore/bug_723.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class MyFileEngine (QAbstractFileEngine): diff --git a/tests/QtCore/bug_724.py b/tests/QtCore/bug_724.py index 75b37183c..601bd8c22 100644 --- a/tests/QtCore/bug_724.py +++ b/tests/QtCore/bug_724.py @@ -1,4 +1,4 @@ -from PySide.QtCore import QAbstractFileEngine, QIODevice, QFile +from PySide2.QtCore import QAbstractFileEngine, QIODevice, QFile import unittest import tempfile import os diff --git a/tests/QtCore/bug_820.py b/tests/QtCore/bug_820.py index 0e721972f..9a0b43b40 100644 --- a/tests/QtCore/bug_820.py +++ b/tests/QtCore/bug_820.py @@ -1,7 +1,7 @@ import functools import unittest -from PySide.QtCore import QObject, Slot, Signal, SIGNAL +from PySide2.QtCore import QObject, Slot, Signal, SIGNAL def log_exception(): def log_exception_decorator(func): diff --git a/tests/QtCore/bug_826.py b/tests/QtCore/bug_826.py index d04b9f345..2bcd55a21 100644 --- a/tests/QtCore/bug_826.py +++ b/tests/QtCore/bug_826.py @@ -1,4 +1,4 @@ -from PySide.QtCore import QEvent, Qt +from PySide2.QtCore import QEvent, Qt import PySide import unittest diff --git a/tests/QtCore/bug_829.py b/tests/QtCore/bug_829.py index 945d8dfb9..4730f16e9 100644 --- a/tests/QtCore/bug_829.py +++ b/tests/QtCore/bug_829.py @@ -2,7 +2,7 @@ # Thomas Perl <thp.io/about>; 2011-04-16 import unittest -from PySide.QtCore import QSettings +from PySide2.QtCore import QSettings import tempfile class QVariantConversions(unittest.TestCase): diff --git a/tests/QtCore/bug_835.py b/tests/QtCore/bug_835.py index 42f613f5d..ab2a95980 100644 --- a/tests/QtCore/bug_835.py +++ b/tests/QtCore/bug_835.py @@ -1,4 +1,4 @@ -from PySide.QtCore import * +from PySide2.QtCore import * import unittest diff --git a/tests/QtCore/bug_920.py b/tests/QtCore/bug_920.py index d7365b986..a42f2f0dd 100644 --- a/tests/QtCore/bug_920.py +++ b/tests/QtCore/bug_920.py @@ -2,7 +2,7 @@ import sys import unittest -import PySide.QtCore as QtCore +import PySide2.QtCore as QtCore class Signaller(QtCore.QObject): s1 = QtCore.Signal() diff --git a/tests/QtCore/bug_927.py b/tests/QtCore/bug_927.py index 87fb0161f..fab22ec79 100644 --- a/tests/QtCore/bug_927.py +++ b/tests/QtCore/bug_927.py @@ -1,7 +1,7 @@ import time import unittest -from PySide.QtCore import QTime, QRunnable, QThreadPool +from PySide2.QtCore import QTime, QRunnable, QThreadPool class Task(QRunnable): def run(self): diff --git a/tests/QtCore/bug_931.py b/tests/QtCore/bug_931.py index 32a33ac80..cc775441e 100644 --- a/tests/QtCore/bug_931.py +++ b/tests/QtCore/bug_931.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import QObject, Signal +from PySide2.QtCore import QObject, Signal o = QObject() class MyObject(QObject): s = Signal(int) diff --git a/tests/QtCore/bug_938.py b/tests/QtCore/bug_938.py index b2ab5657c..692ef1dcf 100644 --- a/tests/QtCore/bug_938.py +++ b/tests/QtCore/bug_938.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class TestBug938 (unittest.TestCase): diff --git a/tests/QtCore/bug_953.py b/tests/QtCore/bug_953.py index 37ef28ea1..13f834c58 100644 --- a/tests/QtCore/bug_953.py +++ b/tests/QtCore/bug_953.py @@ -1,4 +1,4 @@ -from PySide.QtCore import * +from PySide2.QtCore import * class Dispatcher(QObject): _me = None diff --git a/tests/QtCore/bug_987.py b/tests/QtCore/bug_987.py index 9609a457b..8c8c411fc 100644 --- a/tests/QtCore/bug_987.py +++ b/tests/QtCore/bug_987.py @@ -1,4 +1,4 @@ -from PySide.QtCore import QObject +from PySide2.QtCore import QObject import unittest diff --git a/tests/QtCore/bug_994.py b/tests/QtCore/bug_994.py index 67070d6d8..53c732812 100644 --- a/tests/QtCore/bug_994.py +++ b/tests/QtCore/bug_994.py @@ -1,6 +1,6 @@ import unittest import py3kcompat as py3k -from PySide.QtCore import QIODevice, QTextStream +from PySide2.QtCore import QIODevice, QTextStream class MyIODevice (QIODevice): diff --git a/tests/QtCore/bug_PYSIDE-164.py b/tests/QtCore/bug_PYSIDE-164.py index 53a1bd6c2..8d0567902 100644 --- a/tests/QtCore/bug_PYSIDE-164.py +++ b/tests/QtCore/bug_PYSIDE-164.py @@ -1,4 +1,4 @@ -from PySide.QtCore import QCoreApplication, QEventLoop, QObject, Qt, QThread, QTimer, SIGNAL +from PySide2.QtCore import QCoreApplication, QEventLoop, QObject, Qt, QThread, QTimer, SIGNAL import unittest diff --git a/tests/QtCore/bug_PYSIDE-42.py b/tests/QtCore/bug_PYSIDE-42.py index 333001b64..5b3dce20b 100644 --- a/tests/QtCore/bug_PYSIDE-42.py +++ b/tests/QtCore/bug_PYSIDE-42.py @@ -1,5 +1,5 @@ -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * import unittest class TestBugPYSIDE42 (unittest.TestCase): diff --git a/tests/QtCore/child_event_test.py b/tests/QtCore/child_event_test.py index 1be1ce15f..42960f0c7 100644 --- a/tests/QtCore/child_event_test.py +++ b/tests/QtCore/child_event_test.py @@ -3,7 +3,7 @@ import unittest from time import sleep -from PySide.QtCore import QObject, QTimer, QCoreApplication +from PySide2.QtCore import QObject, QTimer, QCoreApplication from helper import UsesQCoreApplication diff --git a/tests/QtCore/classinfo_test.py b/tests/QtCore/classinfo_test.py index a343118e8..58528be87 100644 --- a/tests/QtCore/classinfo_test.py +++ b/tests/QtCore/classinfo_test.py @@ -1,6 +1,6 @@ import unittest import sys -from PySide.QtCore import QObject, ClassInfo +from PySide2.QtCore import QObject, ClassInfo @ClassInfo(author='pyside',url='http://www.pyside.org') class MyObject(QObject): diff --git a/tests/QtCore/deepcopy_test.py b/tests/QtCore/deepcopy_test.py index d44017747..b22daf44b 100644 --- a/tests/QtCore/deepcopy_test.py +++ b/tests/QtCore/deepcopy_test.py @@ -2,9 +2,9 @@ import unittest from copy import deepcopy -from PySide.QtCore import QByteArray, QDate, QDateTime, QTime, QLine, QLineF -from PySide.QtCore import Qt, QSize, QSizeF, QRect, QRectF, QDir, QPoint, QPointF -from PySide.QtCore import QUuid +from PySide2.QtCore import QByteArray, QDate, QDateTime, QTime, QLine, QLineF +from PySide2.QtCore import Qt, QSize, QSizeF, QRect, QRectF, QDir, QPoint, QPointF +from PySide2.QtCore import QUuid class DeepCopyHelper: def testCopy(self): diff --git a/tests/QtCore/deletelater_test.py b/tests/QtCore/deletelater_test.py index 3b2f7d9e3..260ee968c 100644 --- a/tests/QtCore/deletelater_test.py +++ b/tests/QtCore/deletelater_test.py @@ -4,7 +4,7 @@ import unittest -from PySide.QtCore import QObject, QTimer, QCoreApplication, SIGNAL +from PySide2.QtCore import QObject, QTimer, QCoreApplication, SIGNAL from helper import UsesQCoreApplication class TestDeleteLater(UsesQCoreApplication): diff --git a/tests/QtCore/destroysignal_test.py b/tests/QtCore/destroysignal_test.py index f6a9fb573..2702326e3 100644 --- a/tests/QtCore/destroysignal_test.py +++ b/tests/QtCore/destroysignal_test.py @@ -1,4 +1,4 @@ -from PySide.QtCore import QTimer, QObject +from PySide2.QtCore import QTimer, QObject import sys import unittest diff --git a/tests/QtCore/duck_punching_test.py b/tests/QtCore/duck_punching_test.py index 8e856ab0d..5a05d8f1e 100644 --- a/tests/QtCore/duck_punching_test.py +++ b/tests/QtCore/duck_punching_test.py @@ -5,7 +5,7 @@ import unittest import types import sys -from PySide.QtCore import QObject +from PySide2.QtCore import QObject from helper import UsesQCoreApplication def MethodType(func, instance, instanceType): diff --git a/tests/QtCore/hash_test.py b/tests/QtCore/hash_test.py index bf02176e0..5961308b0 100644 --- a/tests/QtCore/hash_test.py +++ b/tests/QtCore/hash_test.py @@ -1,7 +1,7 @@ #!/usr/bin/python import unittest -from PySide.QtCore import QDate, QDateTime, QTime, QUrl -from PySide.QtCore import QLine, QPoint, QRect, QSize +from PySide2.QtCore import QDate, QDateTime, QTime, QUrl +from PySide2.QtCore import QLine, QPoint, QRect, QSize class HashTest(unittest.TestCase): def testInsert(self): diff --git a/tests/QtCore/inherits_test.py b/tests/QtCore/inherits_test.py index da85621e8..135c9d747 100644 --- a/tests/QtCore/inherits_test.py +++ b/tests/QtCore/inherits_test.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import QObject +from PySide2.QtCore import QObject class MyObject(QObject): pass diff --git a/tests/QtCore/max_signals.py b/tests/QtCore/max_signals.py index 154eac4f4..217ecec2d 100644 --- a/tests/QtCore/max_signals.py +++ b/tests/QtCore/max_signals.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import QObject, SIGNAL +from PySide2.QtCore import QObject, SIGNAL class MyObject(QObject): pass diff --git a/tests/QtCore/mockclass_test.py b/tests/QtCore/mockclass_test.py index 4210efdf2..73ad99f74 100644 --- a/tests/QtCore/mockclass_test.py +++ b/tests/QtCore/mockclass_test.py @@ -3,7 +3,7 @@ # Marcus Lindblom <macke@yar.nu>; 2011-02-16 import unittest -from PySide.QtCore import QCoreApplication +from PySide2.QtCore import QCoreApplication class Mock(object): def __init__(self): diff --git a/tests/QtCore/python_conversion.py b/tests/QtCore/python_conversion.py index 84845c0a8..002e7d023 100644 --- a/tests/QtCore/python_conversion.py +++ b/tests/QtCore/python_conversion.py @@ -4,7 +4,7 @@ import unittest import datetime -from PySide.QtCore import QTime, QDateTime, QDate +from PySide2.QtCore import QTime, QDateTime, QDate class TestDateTimeConversions (unittest.TestCase): def testQDate(self): diff --git a/tests/QtCore/qabstractfileengine_test.py b/tests/QtCore/qabstractfileengine_test.py index 457c5c530..572167d1b 100644 --- a/tests/QtCore/qabstractfileengine_test.py +++ b/tests/QtCore/qabstractfileengine_test.py @@ -3,7 +3,7 @@ import unittest import os -from PySide.QtCore import QAbstractFileEngineIterator, QAbstractFileEngine, QAbstractFileEngineHandler, QDir +from PySide2.QtCore import QAbstractFileEngineIterator, QAbstractFileEngine, QAbstractFileEngineHandler, QDir class TestFSIterator(QAbstractFileEngineIterator): diff --git a/tests/QtCore/qabstractitemmodel_test.py b/tests/QtCore/qabstractitemmodel_test.py index 52e6f8d2d..e9f689e43 100644 --- a/tests/QtCore/qabstractitemmodel_test.py +++ b/tests/QtCore/qabstractitemmodel_test.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class MyModel (QAbstractListModel): pass diff --git a/tests/QtCore/qabstracttransition_test.py b/tests/QtCore/qabstracttransition_test.py index fa1e355cc..435f52de3 100644 --- a/tests/QtCore/qabstracttransition_test.py +++ b/tests/QtCore/qabstracttransition_test.py @@ -1,7 +1,7 @@ #!/usr/bin/python import unittest from sys import getrefcount -from PySide.QtCore import * +from PySide2.QtCore import * def addStates(transition): sx = QState() diff --git a/tests/QtCore/qanimationgroup_test.py b/tests/QtCore/qanimationgroup_test.py index 58886d118..4ab0c34f2 100644 --- a/tests/QtCore/qanimationgroup_test.py +++ b/tests/QtCore/qanimationgroup_test.py @@ -1,6 +1,6 @@ #!/usr/bin/python import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class QAnimationGroupTest(unittest.TestCase): diff --git a/tests/QtCore/qbitarray_test.py b/tests/QtCore/qbitarray_test.py index 0ae6e1d2f..b73c36a4e 100644 --- a/tests/QtCore/qbitarray_test.py +++ b/tests/QtCore/qbitarray_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QBitArray +from PySide2.QtCore import QBitArray def bool_list_from_qbitarray(qbitarray): '''This function is used instead of a list comprehension because diff --git a/tests/QtCore/qbytearray_buffer_protocol_test.py b/tests/QtCore/qbytearray_buffer_protocol_test.py index 2ae054839..1fe109803 100644 --- a/tests/QtCore/qbytearray_buffer_protocol_test.py +++ b/tests/QtCore/qbytearray_buffer_protocol_test.py @@ -6,7 +6,7 @@ import unittest import py3kcompat as py3k from os.path import isdir -from PySide.QtCore import QByteArray +from PySide2.QtCore import QByteArray class QByteArrayBufferProtocolTest(unittest.TestCase): diff --git a/tests/QtCore/qbytearray_concatenation_operator_test.py b/tests/QtCore/qbytearray_concatenation_operator_test.py index 13fd231f7..34d914d0d 100644 --- a/tests/QtCore/qbytearray_concatenation_operator_test.py +++ b/tests/QtCore/qbytearray_concatenation_operator_test.py @@ -4,7 +4,7 @@ import unittest -from PySide.QtCore import QByteArray +from PySide2.QtCore import QByteArray class QByteArrayConcatenationOperatorTest(unittest.TestCase): '''Test cases for QByteArray concatenation with '+' operator''' diff --git a/tests/QtCore/qbytearray_operator_iadd_test.py b/tests/QtCore/qbytearray_operator_iadd_test.py index 55559c45e..0304d54c4 100644 --- a/tests/QtCore/qbytearray_operator_iadd_test.py +++ b/tests/QtCore/qbytearray_operator_iadd_test.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import QByteArray +from PySide2.QtCore import QByteArray from helper.docmodifier import DocModifier class BaseQByteArrayOperatorIAdd(object): diff --git a/tests/QtCore/qbytearray_operator_test.py b/tests/QtCore/qbytearray_operator_test.py index 9631ab6f0..9a8b786e3 100644 --- a/tests/QtCore/qbytearray_operator_test.py +++ b/tests/QtCore/qbytearray_operator_test.py @@ -5,7 +5,7 @@ import unittest import py3kcompat as py3k -from PySide.QtCore import QByteArray +from PySide2.QtCore import QByteArray class QByteArrayOperatorEqual(unittest.TestCase): '''TestCase for operator QByteArray == QByteArray''' diff --git a/tests/QtCore/qbytearray_test.py b/tests/QtCore/qbytearray_test.py index 9621a4449..c3ac6763c 100644 --- a/tests/QtCore/qbytearray_test.py +++ b/tests/QtCore/qbytearray_test.py @@ -6,7 +6,7 @@ import ctypes import pickle import py3kcompat as py3k -from PySide.QtCore import QByteArray, QSettings, QObject +from PySide2.QtCore import QByteArray, QSettings, QObject class QByteArrayTestToNumber(unittest.TestCase): def testToNumberInt(self): @@ -151,7 +151,7 @@ class QByteArrayBug720(unittest.TestCase): def testIt(self): ba = QByteArray(b"32\"1\x00123") self.assertEqual(str(ba), "32\"1\x00123") - self.assertEqual(repr(ba), "PySide.QtCore.QByteArray('32\"1\x00123')") + self.assertEqual(repr(ba), "PySide2.QtCore.QByteArray('32\"1\x00123')") class QByteArrayImplicitConvert(unittest.TestCase): def testString(self): diff --git a/tests/QtCore/qcoreapplication_instance_test.py b/tests/QtCore/qcoreapplication_instance_test.py index 365148d34..1ce65d647 100644 --- a/tests/QtCore/qcoreapplication_instance_test.py +++ b/tests/QtCore/qcoreapplication_instance_test.py @@ -4,7 +4,7 @@ import unittest -from PySide.QtCore import QCoreApplication +from PySide2.QtCore import QCoreApplication class QCoreApplicationInstanceTest(unittest.TestCase): '''Test cases for QCoreApplication.instance static method''' diff --git a/tests/QtCore/qdatastream_test.py b/tests/QtCore/qdatastream_test.py index aa4c115df..57781c796 100644 --- a/tests/QtCore/qdatastream_test.py +++ b/tests/QtCore/qdatastream_test.py @@ -4,7 +4,7 @@ import unittest import py3kcompat as py3k -from PySide.QtCore import QBitArray, QByteArray, QIODevice, QDataStream, QDate, QTime, QDateTime +from PySide2.QtCore import QBitArray, QByteArray, QIODevice, QDataStream, QDate, QTime, QDateTime def create_bitarray(string): array = QBitArray(len(string)) diff --git a/tests/QtCore/qdate_test.py b/tests/QtCore/qdate_test.py index e1386ab2b..759bed597 100644 --- a/tests/QtCore/qdate_test.py +++ b/tests/QtCore/qdate_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class TestQDate (unittest.TestCase): def testGetDate(self): diff --git a/tests/QtCore/qdatetime_test.py b/tests/QtCore/qdatetime_test.py index 589254fee..283318f95 100644 --- a/tests/QtCore/qdatetime_test.py +++ b/tests/QtCore/qdatetime_test.py @@ -1,7 +1,7 @@ import unittest import datetime -from PySide.QtCore import QDateTime, QDate, QTime +from PySide2.QtCore import QDateTime, QDate, QTime class TestQDate (unittest.TestCase): def testDateConversion(self): diff --git a/tests/QtCore/qeasingcurve_test.py b/tests/QtCore/qeasingcurve_test.py index 77c0e6c6d..76bbe2744 100644 --- a/tests/QtCore/qeasingcurve_test.py +++ b/tests/QtCore/qeasingcurve_test.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import QEasingCurve +from PySide2.QtCore import QEasingCurve def myFunction(progress): if progress == 1.0: diff --git a/tests/QtCore/qenum_test.py b/tests/QtCore/qenum_test.py index d896ae65a..f69d264bf 100644 --- a/tests/QtCore/qenum_test.py +++ b/tests/QtCore/qenum_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class TestEnum(unittest.TestCase): diff --git a/tests/QtCore/qevent_test.py b/tests/QtCore/qevent_test.py index 07f23f098..34122558c 100644 --- a/tests/QtCore/qevent_test.py +++ b/tests/QtCore/qevent_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QEvent +from PySide2.QtCore import QEvent class QEventTypeFlag(unittest.TestCase): '''Test case for usage of QEvent.Type flags''' diff --git a/tests/QtCore/qfile_test.py b/tests/QtCore/qfile_test.py index 0b911cf72..c8cef5e8d 100644 --- a/tests/QtCore/qfile_test.py +++ b/tests/QtCore/qfile_test.py @@ -5,7 +5,7 @@ import os import tempfile import py3kcompat as py3k -from PySide.QtCore import QFile, QIODevice +from PySide2.QtCore import QFile, QIODevice class GetCharTest(unittest.TestCase): '''Test case for QIODevice.getChar in QFile''' diff --git a/tests/QtCore/qfileinfo_test.py b/tests/QtCore/qfileinfo_test.py index 580b5a7d5..996875539 100644 --- a/tests/QtCore/qfileinfo_test.py +++ b/tests/QtCore/qfileinfo_test.py @@ -4,7 +4,7 @@ import unittest import os import tempfile -from PySide.QtCore import QFile, QFileInfo +from PySide2.QtCore import QFile, QFileInfo class QFileConstructor(unittest.TestCase): '''QFileInfo constructor with qfile''' diff --git a/tests/QtCore/qflags_test.py b/tests/QtCore/qflags_test.py index 9d2f4b1a7..fba582454 100644 --- a/tests/QtCore/qflags_test.py +++ b/tests/QtCore/qflags_test.py @@ -2,7 +2,7 @@ '''Test cases for QFlags''' import unittest -from PySide.QtCore import Qt, QTemporaryFile, QFile, QIODevice, QObject +from PySide2.QtCore import Qt, QTemporaryFile, QFile, QIODevice, QObject class QFlagTest(unittest.TestCase): '''Test case for usage of flags''' diff --git a/tests/QtCore/qhandle_test.py b/tests/QtCore/qhandle_test.py index bcf6dea3d..5f10ab027 100644 --- a/tests/QtCore/qhandle_test.py +++ b/tests/QtCore/qhandle_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QThread, Qt +from PySide2.QtCore import QThread, Qt class TestHANDLE(unittest.TestCase): def testIntConversion(self): diff --git a/tests/QtCore/qinstallmsghandler_test.py b/tests/QtCore/qinstallmsghandler_test.py index b4aa2d5ab..51448cad2 100644 --- a/tests/QtCore/qinstallmsghandler_test.py +++ b/tests/QtCore/qinstallmsghandler_test.py @@ -4,7 +4,7 @@ import unittest import sys -from PySide.QtCore import * +from PySide2.QtCore import * param = [] diff --git a/tests/QtCore/qlinef_test.py b/tests/QtCore/qlinef_test.py index 31b5db955..6b6fa2863 100644 --- a/tests/QtCore/qlinef_test.py +++ b/tests/QtCore/qlinef_test.py @@ -4,7 +4,7 @@ import unittest import os -from PySide.QtCore import * +from PySide2.QtCore import * class TestQLineF (unittest.TestCase): def testIntersect(self): diff --git a/tests/QtCore/qlocale_test.py b/tests/QtCore/qlocale_test.py index f1bff8e82..c9e42fce4 100644 --- a/tests/QtCore/qlocale_test.py +++ b/tests/QtCore/qlocale_test.py @@ -5,7 +5,7 @@ import unittest import ctypes import sys -from PySide.QtCore import QLocale +from PySide2.QtCore import QLocale class QLocaleTestToNumber(unittest.TestCase): def testToNumberInt(self): diff --git a/tests/QtCore/qmetaobject_test.py b/tests/QtCore/qmetaobject_test.py index e0062e32d..8773946b7 100644 --- a/tests/QtCore/qmetaobject_test.py +++ b/tests/QtCore/qmetaobject_test.py @@ -4,7 +4,7 @@ import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class Foo(QFile): pass diff --git a/tests/QtCore/qmodelindex_internalpointer_test.py b/tests/QtCore/qmodelindex_internalpointer_test.py index 015d1c926..daa68ee2b 100644 --- a/tests/QtCore/qmodelindex_internalpointer_test.py +++ b/tests/QtCore/qmodelindex_internalpointer_test.py @@ -4,7 +4,7 @@ import sys import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class MyModel (QAbstractListModel): pass diff --git a/tests/QtCore/qobject_children_segfault_test.py b/tests/QtCore/qobject_children_segfault_test.py index 930a082cf..2e2867965 100644 --- a/tests/QtCore/qobject_children_segfault_test.py +++ b/tests/QtCore/qobject_children_segfault_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QObject, QCoreApplication +from PySide2.QtCore import QObject, QCoreApplication class ChildrenCoreApplication(unittest.TestCase): '''Test case for calling QObject.children after creating a QCoreApp''' diff --git a/tests/QtCore/qobject_connect_notify_test.py b/tests/QtCore/qobject_connect_notify_test.py index b87dd4db7..34b730329 100644 --- a/tests/QtCore/qobject_connect_notify_test.py +++ b/tests/QtCore/qobject_connect_notify_test.py @@ -3,7 +3,7 @@ ''' Test case for QObject::connectNotify()''' import unittest -from PySide.QtCore import * +from PySide2.QtCore import * from helper import UsesQCoreApplication def cute_slot(): diff --git a/tests/QtCore/qobject_event_filter_test.py b/tests/QtCore/qobject_event_filter_test.py index 8fded7983..ea8115500 100644 --- a/tests/QtCore/qobject_event_filter_test.py +++ b/tests/QtCore/qobject_event_filter_test.py @@ -5,7 +5,7 @@ import unittest import weakref import sys -from PySide.QtCore import QObject, QTimerEvent +from PySide2.QtCore import QObject, QTimerEvent from helper import UsesQCoreApplication diff --git a/tests/QtCore/qobject_inherits_test.py b/tests/QtCore/qobject_inherits_test.py index a3db11afb..7dde81b52 100644 --- a/tests/QtCore/qobject_inherits_test.py +++ b/tests/QtCore/qobject_inherits_test.py @@ -2,7 +2,7 @@ import unittest -from PySide.QtCore import QObject +from PySide2.QtCore import QObject class InheritsCase(unittest.TestCase): '''Test case for QObject.inherits''' diff --git a/tests/QtCore/qobject_objectproperty_test.py b/tests/QtCore/qobject_objectproperty_test.py index 2456b82cf..f09bcdac9 100644 --- a/tests/QtCore/qobject_objectproperty_test.py +++ b/tests/QtCore/qobject_objectproperty_test.py @@ -5,7 +5,7 @@ http://bugs.openbossa.org/show_bug.cgi?id=378 ''' import unittest -from PySide.QtCore import QObject +from PySide2.QtCore import QObject class ExtQObject(QObject): def __init__(self): diff --git a/tests/QtCore/qobject_parent_test.py b/tests/QtCore/qobject_parent_test.py index ea393d896..76be16608 100644 --- a/tests/QtCore/qobject_parent_test.py +++ b/tests/QtCore/qobject_parent_test.py @@ -4,7 +4,7 @@ import unittest from sys import getrefcount -from PySide.QtCore import * +from PySide2.QtCore import * class ParentRefCountCase(unittest.TestCase): '''Test case for the refcount changes of setParent''' diff --git a/tests/QtCore/qobject_property_test.py b/tests/QtCore/qobject_property_test.py index 17589cbe8..66de71e38 100644 --- a/tests/QtCore/qobject_property_test.py +++ b/tests/QtCore/qobject_property_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QObject, Property, Signal +from PySide2.QtCore import QObject, Property, Signal class MyObjectWithNotifyProperty(QObject): def __init__(self, parent=None): diff --git a/tests/QtCore/qobject_protected_methods_test.py b/tests/QtCore/qobject_protected_methods_test.py index 37bda37bc..e34d59cf1 100644 --- a/tests/QtCore/qobject_protected_methods_test.py +++ b/tests/QtCore/qobject_protected_methods_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QObject, QThread, SIGNAL +from PySide2.QtCore import QObject, QThread, SIGNAL class Dummy(QObject): '''Dummy class''' diff --git a/tests/QtCore/qobject_test.py b/tests/QtCore/qobject_test.py index 492fc916f..bc76940b0 100644 --- a/tests/QtCore/qobject_test.py +++ b/tests/QtCore/qobject_test.py @@ -5,7 +5,7 @@ import unittest import py3kcompat as py3k -from PySide.QtCore import QObject +from PySide2.QtCore import QObject class ObjectNameCase(unittest.TestCase): '''Tests related to QObject object name''' diff --git a/tests/QtCore/qobject_timer_event_test.py b/tests/QtCore/qobject_timer_event_test.py index b46207d88..99c9120e2 100644 --- a/tests/QtCore/qobject_timer_event_test.py +++ b/tests/QtCore/qobject_timer_event_test.py @@ -3,7 +3,7 @@ import unittest from time import sleep -from PySide.QtCore import QObject, QCoreApplication +from PySide2.QtCore import QObject, QCoreApplication from helper import UsesQCoreApplication diff --git a/tests/QtCore/qobject_tr_as_instance_test.py b/tests/QtCore/qobject_tr_as_instance_test.py index 5aa70530b..d43506f64 100644 --- a/tests/QtCore/qobject_tr_as_instance_test.py +++ b/tests/QtCore/qobject_tr_as_instance_test.py @@ -5,7 +5,7 @@ import os import unittest -from PySide.QtCore import QObject +from PySide2.QtCore import QObject #from helper import UsesQCoreApplication diff --git a/tests/QtCore/qpoint_test.py b/tests/QtCore/qpoint_test.py index dfce76939..b84e1edd9 100644 --- a/tests/QtCore/qpoint_test.py +++ b/tests/QtCore/qpoint_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QPoint, QPointF +from PySide2.QtCore import QPoint, QPointF class QPointTest(unittest.TestCase): diff --git a/tests/QtCore/qprocess_test.py b/tests/QtCore/qprocess_test.py index 96a6b793e..dab3f58bf 100644 --- a/tests/QtCore/qprocess_test.py +++ b/tests/QtCore/qprocess_test.py @@ -5,7 +5,7 @@ import unittest import os import py3kcompat as py3k -from PySide.QtCore import * +from PySide2.QtCore import * class TestQProcess (unittest.TestCase): def testStartDetached(self): diff --git a/tests/QtCore/qproperty_decorator.py b/tests/QtCore/qproperty_decorator.py index 404ce2400..f2039907c 100644 --- a/tests/QtCore/qproperty_decorator.py +++ b/tests/QtCore/qproperty_decorator.py @@ -1,7 +1,7 @@ import weakref import unittest -from PySide.QtCore import QObject, Property +from PySide2.QtCore import QObject, Property class MyObject(QObject): def __init__(self): diff --git a/tests/QtCore/qrect_test.py b/tests/QtCore/qrect_test.py index a6d38d950..a03361664 100644 --- a/tests/QtCore/qrect_test.py +++ b/tests/QtCore/qrect_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QPoint, QRect, QRectF +from PySide2.QtCore import QPoint, QRect, QRectF class RectConstructor(unittest.TestCase): diff --git a/tests/QtCore/qregexp_test.py b/tests/QtCore/qregexp_test.py index 54991854a..a19fc5c2f 100644 --- a/tests/QtCore/qregexp_test.py +++ b/tests/QtCore/qregexp_test.py @@ -1,7 +1,7 @@ #!/usr/bin/python import unittest -from PySide.QtCore import QRegExp +from PySide2.QtCore import QRegExp class QRegExpTest(unittest.TestCase): diff --git a/tests/QtCore/qresource_test.py b/tests/QtCore/qresource_test.py index 4abc3ca04..e9566a014 100644 --- a/tests/QtCore/qresource_test.py +++ b/tests/QtCore/qresource_test.py @@ -4,7 +4,7 @@ import unittest from helper import adjust_filename -from PySide.QtCore import QFile, QIODevice +from PySide2.QtCore import QFile, QIODevice import resources_mc class ResourcesUsage(unittest.TestCase): diff --git a/tests/QtCore/qsize_test.py b/tests/QtCore/qsize_test.py index 4fb060b74..bcad2e20f 100644 --- a/tests/QtCore/qsize_test.py +++ b/tests/QtCore/qsize_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QSize +from PySide2.QtCore import QSize class QSizeOperator(unittest.TestCase): def testOperatorMultiply(self): diff --git a/tests/QtCore/qsrand_test.py b/tests/QtCore/qsrand_test.py index 97d0a3b0b..97a402751 100644 --- a/tests/QtCore/qsrand_test.py +++ b/tests/QtCore/qsrand_test.py @@ -1,7 +1,7 @@ import gc import unittest -from PySide.QtCore import qsrand +from PySide2.QtCore import qsrand class OverflowExceptionCollect(unittest.TestCase): '''Test case for OverflowError exception during garbage collection. See bug #147''' diff --git a/tests/QtCore/qstate_test.py b/tests/QtCore/qstate_test.py index bee73e4ce..045d3f223 100644 --- a/tests/QtCore/qstate_test.py +++ b/tests/QtCore/qstate_test.py @@ -1,6 +1,6 @@ #!/usr/bin/python import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class QStateTest(unittest.TestCase): diff --git a/tests/QtCore/qstatemachine_test.py b/tests/QtCore/qstatemachine_test.py index ce2449d15..9d5847c11 100644 --- a/tests/QtCore/qstatemachine_test.py +++ b/tests/QtCore/qstatemachine_test.py @@ -1,8 +1,8 @@ #!/usr/bin/python import unittest -from PySide.QtCore import QObject, QState, QFinalState, SIGNAL -from PySide.QtCore import QTimer, QStateMachine -from PySide.QtCore import QParallelAnimationGroup +from PySide2.QtCore import QObject, QState, QFinalState, SIGNAL +from PySide2.QtCore import QTimer, QStateMachine +from PySide2.QtCore import QParallelAnimationGroup from helper import UsesQCoreApplication @@ -12,9 +12,9 @@ class StateMachineTest(unittest.TestCase): def testBasic(self): '''State machine classes''' - import PySide.QtCore - PySide.QtCore.QSignalTransition - PySide.QtCore.QPropertyAnimation + import PySide2.QtCore + PySide2.QtCore.QSignalTransition + PySide2.QtCore.QPropertyAnimation diff --git a/tests/QtCore/qstring_test.py b/tests/QtCore/qstring_test.py index 5f2eb9a82..fde00faba 100644 --- a/tests/QtCore/qstring_test.py +++ b/tests/QtCore/qstring_test.py @@ -4,7 +4,7 @@ import unittest import py3kcompat as py3k -from PySide.QtCore import QObject +from PySide2.QtCore import QObject class QStringConstructor(unittest.TestCase): '''Test case for QString constructors''' diff --git a/tests/QtCore/qsysinfo_test.py b/tests/QtCore/qsysinfo_test.py index e9486f5bb..1e54b9b7c 100644 --- a/tests/QtCore/qsysinfo_test.py +++ b/tests/QtCore/qsysinfo_test.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtCore import QSysInfo +from PySide2.QtCore import QSysInfo class TestQSysInfo(unittest.TestCase): def testEnumEndian(self): diff --git a/tests/QtCore/qtext_codec_test.py b/tests/QtCore/qtext_codec_test.py index 2bd7f8139..4f28e1309 100644 --- a/tests/QtCore/qtext_codec_test.py +++ b/tests/QtCore/qtext_codec_test.py @@ -1,7 +1,7 @@ import gc import unittest -from PySide.QtCore import QTextCodec +from PySide2.QtCore import QTextCodec class TestCodecGetters(unittest.TestCase): diff --git a/tests/QtCore/qtextstream_test.py b/tests/QtCore/qtextstream_test.py index c5c87ed1a..976a022ae 100644 --- a/tests/QtCore/qtextstream_test.py +++ b/tests/QtCore/qtextstream_test.py @@ -4,7 +4,7 @@ import unittest import py3kcompat as py3k -from PySide.QtCore import QByteArray, QTextStream, QIODevice, QTextCodec, QFile +from PySide2.QtCore import QByteArray, QTextStream, QIODevice, QTextCodec, QFile class QTextStreamShiftTest(unittest.TestCase): diff --git a/tests/QtCore/qthread_prod_cons_test.py b/tests/QtCore/qthread_prod_cons_test.py index fc634dd88..1c93f1d82 100644 --- a/tests/QtCore/qthread_prod_cons_test.py +++ b/tests/QtCore/qthread_prod_cons_test.py @@ -7,7 +7,7 @@ import logging logging.basicConfig(level=logging.WARNING) -from PySide.QtCore import QThread, QCoreApplication, QObject, SIGNAL +from PySide2.QtCore import QThread, QCoreApplication, QObject, SIGNAL class Bucket(QObject): '''Dummy class to hold the produced values''' diff --git a/tests/QtCore/qthread_signal_test.py b/tests/QtCore/qthread_signal_test.py index edd7d77f4..bbf4b6614 100644 --- a/tests/QtCore/qthread_signal_test.py +++ b/tests/QtCore/qthread_signal_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QThread, QObject, SIGNAL, QCoreApplication +from PySide2.QtCore import QThread, QObject, SIGNAL, QCoreApplication thread_run = False diff --git a/tests/QtCore/qthread_test.py b/tests/QtCore/qthread_test.py index dc99c8e6c..957291e01 100644 --- a/tests/QtCore/qthread_test.py +++ b/tests/QtCore/qthread_test.py @@ -2,8 +2,8 @@ '''Test cases for QThread''' import unittest -from PySide.QtCore import QThread, QCoreApplication, QObject, SIGNAL, QMutex, QTimer -from PySide.QtCore import QEventLoop +from PySide2.QtCore import QThread, QCoreApplication, QObject, SIGNAL, QMutex, QTimer +from PySide2.QtCore import QEventLoop from helper import UsesQCoreApplication diff --git a/tests/QtCore/qtimer_singleshot_test.py b/tests/QtCore/qtimer_singleshot_test.py index 09c9ed662..4670b2a9b 100644 --- a/tests/QtCore/qtimer_singleshot_test.py +++ b/tests/QtCore/qtimer_singleshot_test.py @@ -4,7 +4,7 @@ import unittest -from PySide.QtCore import QObject, QTimer, QCoreApplication, Signal +from PySide2.QtCore import QObject, QTimer, QCoreApplication, Signal from helper import UsesQCoreApplication class WatchDog(QObject): diff --git a/tests/QtCore/qtimer_timeout_test.py b/tests/QtCore/qtimer_timeout_test.py index 5b833fdb9..62d6d4745 100644 --- a/tests/QtCore/qtimer_timeout_test.py +++ b/tests/QtCore/qtimer_timeout_test.py @@ -5,7 +5,7 @@ import unittest import os import sys from tempfile import mkstemp -from PySide.QtCore import QObject, QTimer, SIGNAL +from PySide2.QtCore import QObject, QTimer, SIGNAL from helper import UsesQCoreApplication class WatchDog(QObject): diff --git a/tests/QtCore/qtnamespace_test.py b/tests/QtCore/qtnamespace_test.py index 3343a276b..ed92705cb 100644 --- a/tests/QtCore/qtnamespace_test.py +++ b/tests/QtCore/qtnamespace_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import Qt +from PySide2.QtCore import Qt class QtNamespace(unittest.TestCase): '''Test case for accessing attributes from Qt namespace''' diff --git a/tests/QtCore/qurl_test.py b/tests/QtCore/qurl_test.py index 14243a11a..d7c168afc 100644 --- a/tests/QtCore/qurl_test.py +++ b/tests/QtCore/qurl_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QUrl +from PySide2.QtCore import QUrl class QUrlBasicConstructor(unittest.TestCase): '''Tests the basic constructors''' diff --git a/tests/QtCore/repr_test.py b/tests/QtCore/repr_test.py index 5e85b605c..4329fae59 100644 --- a/tests/QtCore/repr_test.py +++ b/tests/QtCore/repr_test.py @@ -1,9 +1,9 @@ import PySide import unittest -from PySide.QtCore import QByteArray, QDate, QDateTime, QTime, QLine, QLineF -from PySide.QtCore import Qt, QSize, QSizeF, QRect, QRectF, QPoint, QPointF -from PySide.QtCore import QUuid +from PySide2.QtCore import QByteArray, QDate, QDateTime, QTime, QLine, QLineF +from PySide2.QtCore import Qt, QSize, QSizeF, QRect, QRectF, QPoint, QPointF +from PySide2.QtCore import QUuid class ReprCopyHelper: def testCopy(self): diff --git a/tests/QtCore/setprop_on_ctor_test.py b/tests/QtCore/setprop_on_ctor_test.py index bd4426cd1..9fbba4d8b 100644 --- a/tests/QtCore/setprop_on_ctor_test.py +++ b/tests/QtCore/setprop_on_ctor_test.py @@ -1,6 +1,6 @@ #!/usr/bin/python import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class SetPropOnCtorTest(unittest.TestCase): diff --git a/tests/QtCore/staticMetaObject_test.py b/tests/QtCore/staticMetaObject_test.py index f80872ccc..a4ed34d51 100644 --- a/tests/QtCore/staticMetaObject_test.py +++ b/tests/QtCore/staticMetaObject_test.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import QObject, Slot, QMetaObject +from PySide2.QtCore import QObject, Slot, QMetaObject class MyObject(QObject): @Slot(int, str) diff --git a/tests/QtCore/static_method_test.py b/tests/QtCore/static_method_test.py index 1f9de78f7..7d85676d5 100644 --- a/tests/QtCore/static_method_test.py +++ b/tests/QtCore/static_method_test.py @@ -4,7 +4,7 @@ import os import unittest -from PySide.QtCore import QFile +from PySide2.QtCore import QFile class StaticNonStaticMethodsTest(unittest.TestCase): '''Test cases for overloads involving static and non-static versions of a method.''' diff --git a/tests/QtCore/static_protected_methods_test.py b/tests/QtCore/static_protected_methods_test.py index 9d920a438..fabc24d0d 100644 --- a/tests/QtCore/static_protected_methods_test.py +++ b/tests/QtCore/static_protected_methods_test.py @@ -3,7 +3,7 @@ import unittest, time -from PySide.QtCore import QThread +from PySide2.QtCore import QThread class Test (QThread): def run(self): diff --git a/tests/QtCore/thread_signals_test.py b/tests/QtCore/thread_signals_test.py index 1d2f75062..969527eb9 100644 --- a/tests/QtCore/thread_signals_test.py +++ b/tests/QtCore/thread_signals_test.py @@ -5,7 +5,7 @@ import unittest import os from tempfile import mkstemp -from PySide.QtCore import QObject, SIGNAL, QFile, QThread, QTimer, Qt +from PySide2.QtCore import QObject, SIGNAL, QFile, QThread, QTimer, Qt from helper import UsesQCoreApplication class MyThread(QThread): diff --git a/tests/QtCore/tr_noop_test.py b/tests/QtCore/tr_noop_test.py index 92029e008..d2ff61739 100644 --- a/tests/QtCore/tr_noop_test.py +++ b/tests/QtCore/tr_noop_test.py @@ -1,8 +1,8 @@ import unittest import sys -from PySide.QtCore import QT_TR_NOOP, QT_TR_NOOP_UTF8 -from PySide.QtCore import QT_TRANSLATE_NOOP, QT_TRANSLATE_NOOP3, QT_TRANSLATE_NOOP_UTF8 +from PySide2.QtCore import QT_TR_NOOP, QT_TR_NOOP_UTF8 +from PySide2.QtCore import QT_TRANSLATE_NOOP, QT_TRANSLATE_NOOP3, QT_TRANSLATE_NOOP_UTF8 class QtTrNoopTest(unittest.TestCase): diff --git a/tests/QtCore/translation_test.py b/tests/QtCore/translation_test.py index adf830cd6..8a201e24f 100644 --- a/tests/QtCore/translation_test.py +++ b/tests/QtCore/translation_test.py @@ -6,7 +6,7 @@ import os import unittest import py3kcompat as py3k -from PySide.QtCore import QObject, QTranslator, QCoreApplication +from PySide2.QtCore import QObject, QTranslator, QCoreApplication from helper import UsesQCoreApplication diff --git a/tests/QtCore/unaryoperator_test.py b/tests/QtCore/unaryoperator_test.py index 94db1feec..d234440db 100644 --- a/tests/QtCore/unaryoperator_test.py +++ b/tests/QtCore/unaryoperator_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QPoint +from PySide2.QtCore import QPoint class NegUnaryOperatorTest(unittest.TestCase): '''Tests the presence of unary operator __neg__ on the QPoint class''' diff --git a/tests/QtCore/unicode_test.py b/tests/QtCore/unicode_test.py index ccc499739..ba619a586 100644 --- a/tests/QtCore/unicode_test.py +++ b/tests/QtCore/unicode_test.py @@ -6,7 +6,7 @@ import unittest import py3kcompat as py3k -from PySide.QtCore import QObject +from PySide2.QtCore import QObject class UnicodeConversion(unittest.TestCase): '''Test case for QString to/from Python Unicode conversion''' diff --git a/tests/QtDeclarative/bug_1029.py b/tests/QtDeclarative/bug_1029.py index a416ddd65..b0d5d2ead 100644 --- a/tests/QtDeclarative/bug_1029.py +++ b/tests/QtDeclarative/bug_1029.py @@ -1,6 +1,6 @@ -from PySide.QtCore import * -from PySide.QtWidgets import * -from PySide.QtDeclarative import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtDeclarative import * import sys import gc diff --git a/tests/QtDeclarative/bug_557.py b/tests/QtDeclarative/bug_557.py index b01f3926f..75bb570db 100644 --- a/tests/QtDeclarative/bug_557.py +++ b/tests/QtDeclarative/bug_557.py @@ -1,6 +1,6 @@ -from PySide.QtCore import * -from PySide.QtWidgets import * -from PySide.QtDeclarative import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtDeclarative import * import sys diff --git a/tests/QtDeclarative/bug_814.py b/tests/QtDeclarative/bug_814.py index e2bfc36b5..824693485 100644 --- a/tests/QtDeclarative/bug_814.py +++ b/tests/QtDeclarative/bug_814.py @@ -6,8 +6,8 @@ # 2011-04-08 Thomas Perl <m@thp.io> # Released under the same terms as PySide itself -from PySide.QtCore import QUrl, QAbstractListModel, QModelIndex -from PySide.QtDeclarative import QDeclarativeView +from PySide2.QtCore import QUrl, QAbstractListModel, QModelIndex +from PySide2.QtDeclarative import QDeclarativeView from helper import adjust_filename, TimedQApplication import unittest diff --git a/tests/QtDeclarative/bug_825.py b/tests/QtDeclarative/bug_825.py index 2614f7b67..d30ca5b30 100644 --- a/tests/QtDeclarative/bug_825.py +++ b/tests/QtDeclarative/bug_825.py @@ -1,6 +1,6 @@ -from PySide.QtCore import * -from PySide.QtWidgets import * -from PySide.QtDeclarative import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtDeclarative import * from helper import adjust_filename import unittest diff --git a/tests/QtDeclarative/bug_847.py b/tests/QtDeclarative/bug_847.py index 91619c8a6..c106b229d 100644 --- a/tests/QtDeclarative/bug_847.py +++ b/tests/QtDeclarative/bug_847.py @@ -6,8 +6,8 @@ import unittest -from PySide.QtCore import Slot, Signal, QUrl -from PySide.QtDeclarative import QDeclarativeView +from PySide2.QtCore import Slot, Signal, QUrl +from PySide2.QtDeclarative import QDeclarativeView from helper import adjust_filename, UsesQApplication diff --git a/tests/QtDeclarative/bug_915.py b/tests/QtDeclarative/bug_915.py index 193668223..3a77a69e1 100644 --- a/tests/QtDeclarative/bug_915.py +++ b/tests/QtDeclarative/bug_915.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtDeclarative import QDeclarativeView, QDeclarativeItem +from PySide2.QtDeclarative import QDeclarativeView, QDeclarativeItem from helper import TimedQApplication class TestBug915(TimedQApplication): diff --git a/tests/QtDeclarative/bug_926.py b/tests/QtDeclarative/bug_926.py index bc8d2fc6b..813f330b8 100644 --- a/tests/QtDeclarative/bug_926.py +++ b/tests/QtDeclarative/bug_926.py @@ -1,9 +1,9 @@ import sys import unittest from helper import adjust_filename -from PySide.QtCore import * -from PySide.QtWidgets import * -from PySide.QtDeclarative import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtDeclarative import * class MyClass (QObject): diff --git a/tests/QtDeclarative/bug_951.py b/tests/QtDeclarative/bug_951.py index 0cd895315..881fbac79 100644 --- a/tests/QtDeclarative/bug_951.py +++ b/tests/QtDeclarative/bug_951.py @@ -1,5 +1,5 @@ -from PySide.QtDeclarative import QDeclarativeItem, qmlRegisterType, QDeclarativeView
-from PySide.QtCore import QUrl
+from PySide2.QtDeclarative import QDeclarativeItem, qmlRegisterType, QDeclarativeView
+from PySide2.QtCore import QUrl
from helper import adjust_filename, TimedQApplication
import unittest
diff --git a/tests/QtDeclarative/bug_995.py b/tests/QtDeclarative/bug_995.py index ccfbb143e..ab52b1049 100644 --- a/tests/QtDeclarative/bug_995.py +++ b/tests/QtDeclarative/bug_995.py @@ -1,5 +1,5 @@ -from PySide.QtWidgets import * -from PySide.QtDeclarative import * +from PySide2.QtWidgets import * +from PySide2.QtDeclarative import * from helper import adjust_filename, UsesQApplication app = QApplication([]) diff --git a/tests/QtDeclarative/qdeclarativenetwork_test.py b/tests/QtDeclarative/qdeclarativenetwork_test.py index 459c422b2..26f455a6a 100644 --- a/tests/QtDeclarative/qdeclarativenetwork_test.py +++ b/tests/QtDeclarative/qdeclarativenetwork_test.py @@ -2,9 +2,9 @@ import unittest -from PySide.QtCore import QUrl -from PySide.QtDeclarative import QDeclarativeView, QDeclarativeNetworkAccessManagerFactory -from PySide.QtNetwork import QNetworkAccessManager +from PySide2.QtCore import QUrl +from PySide2.QtDeclarative import QDeclarativeView, QDeclarativeNetworkAccessManagerFactory +from PySide2.QtNetwork import QNetworkAccessManager from helper import adjust_filename, TimedQApplication diff --git a/tests/QtDeclarative/qdeclarativeview_test.py b/tests/QtDeclarative/qdeclarativeview_test.py index 468de976d..ea729d596 100644 --- a/tests/QtDeclarative/qdeclarativeview_test.py +++ b/tests/QtDeclarative/qdeclarativeview_test.py @@ -2,8 +2,8 @@ import unittest -from PySide.QtCore import QUrl, QObject, Property, Slot -from PySide.QtDeclarative import QDeclarativeView +from PySide2.QtCore import QUrl, QObject, Property, Slot +from PySide2.QtDeclarative import QDeclarativeView from helper import adjust_filename, TimedQApplication diff --git a/tests/QtDeclarative/registertype.py b/tests/QtDeclarative/registertype.py index bea1e77c9..ce1c8fbd2 100644 --- a/tests/QtDeclarative/registertype.py +++ b/tests/QtDeclarative/registertype.py @@ -2,9 +2,9 @@ import sys import unittest import helper -from PySide.QtCore import * -from PySide.QtWidgets import * -from PySide.QtDeclarative import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtDeclarative import * class PieSlice (QDeclarativeItem): diff --git a/tests/QtGui/action_clear.py b/tests/QtGui/action_clear.py index c22a3c139..8507f8227 100644 --- a/tests/QtGui/action_clear.py +++ b/tests/QtGui/action_clear.py @@ -1,4 +1,4 @@ -from PySide.QtWidgets import QMenu, QWidget, QMenuBar, QToolBar +from PySide2.QtWidgets import QMenu, QWidget, QMenuBar, QToolBar import weakref import unittest diff --git a/tests/QtGui/add_action_test.py b/tests/QtGui/add_action_test.py index 412a3d203..fe625547d 100644 --- a/tests/QtGui/add_action_test.py +++ b/tests/QtGui/add_action_test.py @@ -3,8 +3,8 @@ import unittest -from PySide.QtCore import SLOT -from PySide.QtWidgets import QMenuBar, QAction, QPushButton +from PySide2.QtCore import SLOT +from PySide2.QtWidgets import QMenuBar, QAction, QPushButton from helper import UsesQApplication diff --git a/tests/QtGui/api2_test.py b/tests/QtGui/api2_test.py index 8d972a970..fdb7b3cf8 100644 --- a/tests/QtGui/api2_test.py +++ b/tests/QtGui/api2_test.py @@ -4,8 +4,8 @@ import unittest import sys -from PySide.QtGui import QIntValidator, QValidator -from PySide.QtWidgets import QWidget, QSpinBox, QApplication +from PySide2.QtGui import QIntValidator, QValidator +from PySide2.QtWidgets import QWidget, QSpinBox, QApplication from helper import UsesQApplication diff --git a/tests/QtGui/bug_1002.py b/tests/QtGui/bug_1002.py index 3890bad15..06adf0862 100644 --- a/tests/QtGui/bug_1002.py +++ b/tests/QtGui/bug_1002.py @@ -1,6 +1,6 @@ import unittest import sys -from PySide.QtWidgets import QWidget, QPushButton +from PySide2.QtWidgets import QWidget, QPushButton from helper import UsesQApplication diff --git a/tests/QtGui/bug_1006.py b/tests/QtGui/bug_1006.py index b92c13dc8..9c71a5efb 100644 --- a/tests/QtGui/bug_1006.py +++ b/tests/QtGui/bug_1006.py @@ -2,8 +2,8 @@ import unittest import weakref import sys -from PySide.QtCore import Qt -from PySide.QtWidgets import QDialog, QLabel, QGridLayout, QHBoxLayout, QWidget +from PySide2.QtCore import Qt +from PySide2.QtWidgets import QDialog, QLabel, QGridLayout, QHBoxLayout, QWidget from helper import TimedQApplication diff --git a/tests/QtGui/bug_172.py b/tests/QtGui/bug_172.py index 8796cbc5f..4fbc24cd1 100644 --- a/tests/QtGui/bug_172.py +++ b/tests/QtGui/bug_172.py @@ -1,4 +1,4 @@ -from PySide.QtWidgets import * +from PySide2.QtWidgets import * if __name__ == '__main__': app = QApplication([]) diff --git a/tests/QtGui/bug_243.py b/tests/QtGui/bug_243.py index d19c6a0ff..fc7866978 100644 --- a/tests/QtGui/bug_243.py +++ b/tests/QtGui/bug_243.py @@ -4,7 +4,7 @@ import unittest import sys -from PySide.QtWidgets import QApplication, QMainWindow, QLayout +from PySide2.QtWidgets import QApplication, QMainWindow, QLayout class QAppPresence(unittest.TestCase): diff --git a/tests/QtGui/bug_300_test.py b/tests/QtGui/bug_300_test.py index ec02cdf02..d90e14435 100644 --- a/tests/QtGui/bug_300_test.py +++ b/tests/QtGui/bug_300_test.py @@ -1,5 +1,5 @@ -from PySide.QtGui import QStringListModel -from PySide.QtCore import QModelIndex +from PySide2.QtGui import QStringListModel +from PySide2.QtCore import QModelIndex import unittest class TestQAbstractItemModelSignals(unittest.TestCase): diff --git a/tests/QtGui/bug_307.py b/tests/QtGui/bug_307.py index 4f6cca240..34cbbd74e 100644 --- a/tests/QtGui/bug_307.py +++ b/tests/QtGui/bug_307.py @@ -2,8 +2,8 @@ import unittest import colorsys -from PySide.QtCore import SIGNAL -from PySide.QtWidgets import QPushButton, QApplication +from PySide2.QtCore import SIGNAL +from PySide2.QtWidgets import QPushButton, QApplication class Test (QApplication) : diff --git a/tests/QtGui/bug_324.py b/tests/QtGui/bug_324.py index 952ec305b..a3ada635a 100644 --- a/tests/QtGui/bug_324.py +++ b/tests/QtGui/bug_324.py @@ -3,8 +3,8 @@ import unittest import sys import signal -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * class QBug( QObject ): def __init__(self, parent = None): diff --git a/tests/QtGui/bug_400.py b/tests/QtGui/bug_400.py index 6db4e70c8..9289ffc45 100644 --- a/tests/QtGui/bug_400.py +++ b/tests/QtGui/bug_400.py @@ -2,7 +2,7 @@ import unittest from helper import UsesQApplication -from PySide.QtWidgets import QTreeWidgetItemIterator, QTreeWidgetItem, QTreeWidget +from PySide2.QtWidgets import QTreeWidgetItemIterator, QTreeWidgetItem, QTreeWidget class BugTest(UsesQApplication): def testCase(self): diff --git a/tests/QtGui/bug_416.py b/tests/QtGui/bug_416.py index d1d1f1897..bf2988175 100644 --- a/tests/QtGui/bug_416.py +++ b/tests/QtGui/bug_416.py @@ -2,8 +2,8 @@ import unittest from helper import TimedQApplication -from PySide.QtCore import QSignalTransition, QState, Qt, QStateMachine -from PySide.QtWidgets import QCheckBox +from PySide2.QtCore import QSignalTransition, QState, Qt, QStateMachine +from PySide2.QtWidgets import QCheckBox class CheckedTransition(QSignalTransition): def __init__(self, check): diff --git a/tests/QtGui/bug_429.py b/tests/QtGui/bug_429.py index 287bc58db..8a0683a13 100644 --- a/tests/QtGui/bug_429.py +++ b/tests/QtGui/bug_429.py @@ -1,5 +1,5 @@ -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * import sys app = QApplication(sys.argv) diff --git a/tests/QtGui/bug_430.py b/tests/QtGui/bug_430.py index d6354a0c3..f19f6d350 100644 --- a/tests/QtGui/bug_430.py +++ b/tests/QtGui/bug_430.py @@ -1,6 +1,6 @@ import sys -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * class ListModel(QAbstractListModel): def rowCount(self, parent = QModelIndex()): diff --git a/tests/QtGui/bug_467.py b/tests/QtGui/bug_467.py index eaa5105fd..e2861b473 100644 --- a/tests/QtGui/bug_467.py +++ b/tests/QtGui/bug_467.py @@ -2,7 +2,7 @@ import unittest from helper import UsesQApplication -from PySide.QtWidgets import QMainWindow, QApplication +from PySide2.QtWidgets import QMainWindow, QApplication class MyWidget(QMainWindow): def __init__(self, parent = None): diff --git a/tests/QtGui/bug_493.py b/tests/QtGui/bug_493.py index 3c4b5d637..cf1b68c64 100644 --- a/tests/QtGui/bug_493.py +++ b/tests/QtGui/bug_493.py @@ -1,6 +1,6 @@ -from PySide.QtCore import Qt, QEvent -from PySide.QtGui import QKeyEvent, QKeySequence -from PySide.QtWidgets import QApplication +from PySide2.QtCore import Qt, QEvent +from PySide2.QtGui import QKeyEvent, QKeySequence +from PySide2.QtWidgets import QApplication import unittest diff --git a/tests/QtGui/bug_500.py b/tests/QtGui/bug_500.py index 2c4060869..2058adca6 100644 --- a/tests/QtGui/bug_500.py +++ b/tests/QtGui/bug_500.py @@ -2,8 +2,8 @@ import unittest -from PySide.QtCore import * -from PySide.QtPrintSupport import * +from PySide2.QtCore import * +from PySide2.QtPrintSupport import * from helper import UsesQApplication class NeverDiesTest(UsesQApplication): diff --git a/tests/QtGui/bug_512.py b/tests/QtGui/bug_512.py index 3430fd9f3..031337a5c 100644 --- a/tests/QtGui/bug_512.py +++ b/tests/QtGui/bug_512.py @@ -2,8 +2,8 @@ import unittest from helper import UsesQApplication -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * class BugTest(UsesQApplication): def testCase(self): diff --git a/tests/QtGui/bug_525.py b/tests/QtGui/bug_525.py index 6410a5b6c..936ec45d5 100644 --- a/tests/QtGui/bug_525.py +++ b/tests/QtGui/bug_525.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtWidgets import QApplication -from PySide.QtWidgets import QMenu +from PySide2.QtWidgets import QApplication +from PySide2.QtWidgets import QMenu class M2(QMenu): def __init__(self,parent=None): diff --git a/tests/QtGui/bug_546.py b/tests/QtGui/bug_546.py index 90aeece2d..1473ede30 100644 --- a/tests/QtGui/bug_546.py +++ b/tests/QtGui/bug_546.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtWidgets import * +from PySide2.QtWidgets import * class TestBug546(unittest.TestCase): diff --git a/tests/QtGui/bug_549.py b/tests/QtGui/bug_549.py index a4e0eb4f8..c0c1ff832 100644 --- a/tests/QtGui/bug_549.py +++ b/tests/QtGui/bug_549.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtWidgets import * +from PySide2.QtWidgets import * class TestBug549(unittest.TestCase): def testBug(self): diff --git a/tests/QtGui/bug_569.py b/tests/QtGui/bug_569.py index 482b79484..66889053a 100644 --- a/tests/QtGui/bug_569.py +++ b/tests/QtGui/bug_569.py @@ -1,5 +1,5 @@ -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * import unittest diff --git a/tests/QtGui/bug_575.py b/tests/QtGui/bug_575.py index ca8678069..4ac5bc62d 100644 --- a/tests/QtGui/bug_575.py +++ b/tests/QtGui/bug_575.py @@ -1,7 +1,7 @@ """ Unittest for bug #575 """ """ http://bugs.openbossa.org/show_bug.cgi?id=575 """ -from PySide.QtWidgets import QApplication, QPlainTextEdit, QTextEdit +from PySide2.QtWidgets import QApplication, QPlainTextEdit, QTextEdit import sys import unittest diff --git a/tests/QtGui/bug_606.py b/tests/QtGui/bug_606.py index 0fe1bde6e..06bd79692 100644 --- a/tests/QtGui/bug_606.py +++ b/tests/QtGui/bug_606.py @@ -1,8 +1,8 @@ import unittest import PySide -from PySide.QtGui import QVector2D, QVector3D, QVector4D -from PySide.QtGui import QColor +from PySide2.QtGui import QVector2D, QVector3D, QVector4D +from PySide2.QtGui import QColor class testCases(unittest.TestCase): def testQVector2DToTuple(self): diff --git a/tests/QtGui/bug_617.py b/tests/QtGui/bug_617.py index fc8952f54..8aa0c38f9 100644 --- a/tests/QtGui/bug_617.py +++ b/tests/QtGui/bug_617.py @@ -1,5 +1,5 @@ -from PySide.QtCore import QEvent -from PySide.QtGui import QColor +from PySide2.QtCore import QEvent +from PySide2.QtGui import QColor import unittest class MyEvent(QEvent): @@ -15,7 +15,7 @@ class Bug617(unittest.TestCase): def testOutOfBounds(self): e = MyEvent() - self.assertEqual(repr(e.type()), 'PySide.QtCore.QEvent.Type(999)') + self.assertEqual(repr(e.type()), 'PySide2.QtCore.QEvent.Type(999)') if __name__ == "__main__": unittest.main() diff --git a/tests/QtGui/bug_632.py b/tests/QtGui/bug_632.py index c27d44dc5..c97ec8813 100644 --- a/tests/QtGui/bug_632.py +++ b/tests/QtGui/bug_632.py @@ -1,5 +1,5 @@ import sys -from PySide.QtWidgets import QLineEdit, QApplication +from PySide2.QtWidgets import QLineEdit, QApplication import unittest diff --git a/tests/QtGui/bug_635.py b/tests/QtGui/bug_635.py index c0a64846a..9d07fbe8c 100644 --- a/tests/QtGui/bug_635.py +++ b/tests/QtGui/bug_635.py @@ -1,8 +1,8 @@ ''' Test bug 635: http://bugs.openbossa.org/show_bug.cgi?id=635''' import unittest -from PySide.QtGui import QIcon -from PySide.QtWidgets import QApplication, QToolBar +from PySide2.QtGui import QIcon +from PySide2.QtWidgets import QApplication, QToolBar import sys class testQToolBar(unittest.TestCase): diff --git a/tests/QtGui/bug_640.py b/tests/QtGui/bug_640.py index b049db23d..23941050f 100644 --- a/tests/QtGui/bug_640.py +++ b/tests/QtGui/bug_640.py @@ -1,5 +1,5 @@ import sys -from PySide.QtWidgets import * +from PySide2.QtWidgets import * import unittest class Bug640(unittest.TestCase): diff --git a/tests/QtGui/bug_652.py b/tests/QtGui/bug_652.py index 438fdbde4..14e6f62a0 100644 --- a/tests/QtGui/bug_652.py +++ b/tests/QtGui/bug_652.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtGui import * +from PySide2.QtGui import * class MyData(QTextBlockUserData): def __init__(self, data): diff --git a/tests/QtGui/bug_653.py b/tests/QtGui/bug_653.py index 67892ce73..5cf8a0404 100644 --- a/tests/QtGui/bug_653.py +++ b/tests/QtGui/bug_653.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * class TestBug653(unittest.TestCase): """Crash after calling QWizardPage.wizard()""" diff --git a/tests/QtGui/bug_660.py b/tests/QtGui/bug_660.py index b97217f30..345e23e40 100644 --- a/tests/QtGui/bug_660.py +++ b/tests/QtGui/bug_660.py @@ -1,6 +1,6 @@ import unittest import py3kcompat as py3k -from PySide.QtGui import QStandardItemModel, QStandardItem +from PySide2.QtGui import QStandardItemModel, QStandardItem class MyItemModel(QStandardItemModel): def __init__(self,parent=None): diff --git a/tests/QtGui/bug_662.py b/tests/QtGui/bug_662.py index 2a5307dd6..4b1b99bb6 100644 --- a/tests/QtGui/bug_662.py +++ b/tests/QtGui/bug_662.py @@ -1,8 +1,8 @@ ''' Test bug 662: http://bugs.openbossa.org/show_bug.cgi?id=662''' import unittest -from PySide.QtGui import QTextCharFormat -from PySide.QtWidgets import QTextEdit, QApplication +from PySide2.QtGui import QTextCharFormat +from PySide2.QtWidgets import QTextEdit, QApplication import sys class testQTextBlock(unittest.TestCase): diff --git a/tests/QtGui/bug_667.py b/tests/QtGui/bug_667.py index 40c8d64a3..a6ae492d2 100644 --- a/tests/QtGui/bug_667.py +++ b/tests/QtGui/bug_667.py @@ -1,5 +1,5 @@ -from PySide.QtCore import * -from PySide.QtGui import * +from PySide2.QtCore import * +from PySide2.QtGui import * class Ball(QGraphicsEllipseItem): def __init__(self, d, parent=None): diff --git a/tests/QtGui/bug_668.py b/tests/QtGui/bug_668.py index c37dccee7..46ee8212d 100644 --- a/tests/QtGui/bug_668.py +++ b/tests/QtGui/bug_668.py @@ -1,6 +1,6 @@ # coding: utf-8 -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * import sys diff --git a/tests/QtGui/bug_674.py b/tests/QtGui/bug_674.py index 5e93da5c7..f913236a4 100644 --- a/tests/QtGui/bug_674.py +++ b/tests/QtGui/bug_674.py @@ -1,5 +1,5 @@ -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * import unittest import sys diff --git a/tests/QtGui/bug_675.py b/tests/QtGui/bug_675.py index 4efb3b9b0..a6d0a9ca1 100644 --- a/tests/QtGui/bug_675.py +++ b/tests/QtGui/bug_675.py @@ -1,5 +1,5 @@ -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * app = QApplication([]) diff --git a/tests/QtGui/bug_688.py b/tests/QtGui/bug_688.py index d3b2b4032..4782f3610 100644 --- a/tests/QtGui/bug_688.py +++ b/tests/QtGui/bug_688.py @@ -2,8 +2,8 @@ import unittest from helper import UsesQApplication -from PySide.QtGui import QTextFrame, QTextCursor, QTextCharFormat, QFont, QTextFrameFormat -from PySide.QtWidgets import QTextEdit +from PySide2.QtGui import QTextFrame, QTextCursor, QTextCharFormat, QFont, QTextFrameFormat +from PySide2.QtWidgets import QTextEdit class BugTest(UsesQApplication): def testCase(self): diff --git a/tests/QtGui/bug_693.py b/tests/QtGui/bug_693.py index 719738b24..0fcd54219 100644 --- a/tests/QtGui/bug_693.py +++ b/tests/QtGui/bug_693.py @@ -1,6 +1,6 @@ -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * import unittest class MyModel (QAbstractListModel): @@ -22,7 +22,7 @@ class TestBug693(unittest.TestCase): view.show() # This must NOT throw the exception: - # RuntimeError: Internal C++ object (PySide.QtCore.QLine) already deleted. + # RuntimeError: Internal C++ object (PySide2.QtCore.QLine) already deleted. MyModel.stupidLine.isNull() diff --git a/tests/QtGui/bug_696.py b/tests/QtGui/bug_696.py index 6f98b41c3..1f0d7aeb8 100644 --- a/tests/QtGui/bug_696.py +++ b/tests/QtGui/bug_696.py @@ -28,7 +28,7 @@ import sys import unittest from helper import UsesQApplication -from PySide.QtWidgets import QMainWindow, QMenu, QApplication +from PySide2.QtWidgets import QMainWindow, QMenu, QApplication class MainWindow(QMainWindow): def __init__(self, *args): diff --git a/tests/QtGui/bug_711.py b/tests/QtGui/bug_711.py index d21559181..0ce4987c3 100644 --- a/tests/QtGui/bug_711.py +++ b/tests/QtGui/bug_711.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtWidgets import QToolBar, QApplication, QAction, QToolButton +from PySide2.QtWidgets import QToolBar, QApplication, QAction, QToolButton try: xrange diff --git a/tests/QtGui/bug_714.py b/tests/QtGui/bug_714.py index 3ff6ba6c8..a3f9c7122 100644 --- a/tests/QtGui/bug_714.py +++ b/tests/QtGui/bug_714.py @@ -1,7 +1,7 @@ import unittest import sys -from PySide.QtGui import QPixmap -from PySide.QtWidgets import QLabel, QApplication +from PySide2.QtGui import QPixmap +from PySide2.QtWidgets import QLabel, QApplication class TestLabelPixmap(unittest.TestCase): def testReference(self): diff --git a/tests/QtGui/bug_716.py b/tests/QtGui/bug_716.py index fe5315e5b..f5266c7e4 100644 --- a/tests/QtGui/bug_716.py +++ b/tests/QtGui/bug_716.py @@ -1,5 +1,5 @@ -from PySide.QtCore import Qt, QPersistentModelIndex -from PySide.QtGui import QStringListModel +from PySide2.QtCore import Qt, QPersistentModelIndex +from PySide2.QtGui import QStringListModel if __name__ == '__main__': stringListModel = QStringListModel(['one', 'two']) diff --git a/tests/QtGui/bug_722.py b/tests/QtGui/bug_722.py index 63ca6d572..c67ca725b 100644 --- a/tests/QtGui/bug_722.py +++ b/tests/QtGui/bug_722.py @@ -2,7 +2,7 @@ import unittest from helper import UsesQApplication -from PySide.QtWidgets import QDoubleSpinBox, QGraphicsBlurEffect +from PySide2.QtWidgets import QDoubleSpinBox, QGraphicsBlurEffect class TestSignalConnection(UsesQApplication): def testFloatSignal(self): diff --git a/tests/QtGui/bug_728.py b/tests/QtGui/bug_728.py index fa5b1f057..89c8f6668 100644 --- a/tests/QtGui/bug_728.py +++ b/tests/QtGui/bug_728.py @@ -1,5 +1,5 @@ -from PySide.QtWidgets import * -from PySide.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtCore import * app = QApplication([]) QTimer.singleShot(200, app.quit) diff --git a/tests/QtGui/bug_736.py b/tests/QtGui/bug_736.py index 04b465b92..a0248252e 100644 --- a/tests/QtGui/bug_736.py +++ b/tests/QtGui/bug_736.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * class TestBug736 (unittest.TestCase): diff --git a/tests/QtGui/bug_740.py b/tests/QtGui/bug_740.py index 302a1a13f..d29a62eb5 100644 --- a/tests/QtGui/bug_740.py +++ b/tests/QtGui/bug_740.py @@ -1,8 +1,8 @@ import unittest import py3kcompat as py3k from helper import UsesQApplication -from PySide.QtCore import QSize -from PySide.QtGui import QBitmap, QImage +from PySide2.QtCore import QSize +from PySide2.QtGui import QBitmap, QImage class TestQBitmap(UsesQApplication): def testFromDataMethod(self): diff --git a/tests/QtGui/bug_743.py b/tests/QtGui/bug_743.py index 0957fccc2..abab13959 100644 --- a/tests/QtGui/bug_743.py +++ b/tests/QtGui/bug_743.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtGui import QMatrix4x4 +from PySide2.QtGui import QMatrix4x4 class TestQMatrix(unittest.TestCase): def testOperator(self): diff --git a/tests/QtGui/bug_750.py b/tests/QtGui/bug_750.py index c929ed70c..adf184b76 100644 --- a/tests/QtGui/bug_750.py +++ b/tests/QtGui/bug_750.py @@ -2,9 +2,9 @@ import unittest from helper import UsesQApplication -from PySide.QtCore import QTimer -from PySide.QtGui import QPainter, QFont, QFontInfo -from PySide.QtWidgets import QWidget, qApp +from PySide2.QtCore import QTimer +from PySide2.QtGui import QPainter, QFont, QFontInfo +from PySide2.QtWidgets import QWidget, qApp class MyWidget(QWidget): def paintEvent(self, e): diff --git a/tests/QtGui/bug_778.py b/tests/QtGui/bug_778.py index 49ce161a9..4395ecf67 100644 --- a/tests/QtGui/bug_778.py +++ b/tests/QtGui/bug_778.py @@ -2,7 +2,7 @@ import unittest from helper import UsesQApplication -from PySide.QtWidgets import QTreeWidget, QTreeWidgetItem, QTreeWidgetItemIterator +from PySide2.QtWidgets import QTreeWidget, QTreeWidgetItem, QTreeWidgetItemIterator class QTreeWidgetItemIteratorTest(UsesQApplication): def testWidgetIterator(self): diff --git a/tests/QtGui/bug_785.py b/tests/QtGui/bug_785.py index 99c07bc5d..f42f4e2f3 100644 --- a/tests/QtGui/bug_785.py +++ b/tests/QtGui/bug_785.py @@ -1,8 +1,8 @@ import sys
import unittest
-from PySide.QtGui import QStandardItemModel, QStandardItem, QItemSelection
-from PySide.QtWidgets import QApplication
+from PySide2.QtGui import QStandardItemModel, QStandardItem, QItemSelection
+from PySide2.QtWidgets import QApplication
class Bug324(unittest.TestCase):
def testOperators(self):
model = QStandardItemModel()
diff --git a/tests/QtGui/bug_793.py b/tests/QtGui/bug_793.py index 5e97b5ebd..476722b3d 100644 --- a/tests/QtGui/bug_793.py +++ b/tests/QtGui/bug_793.py @@ -1,7 +1,7 @@ import unittest import sys -from PySide.QtCore import QTimer -from PySide.QtWidgets import QWidget, QApplication +from PySide2.QtCore import QTimer +from PySide2.QtWidgets import QWidget, QApplication class TestW1(QWidget): def __init__(self, parent = None): diff --git a/tests/QtGui/bug_811.py b/tests/QtGui/bug_811.py index 272fecb60..a11de9b2d 100644 --- a/tests/QtGui/bug_811.py +++ b/tests/QtGui/bug_811.py @@ -4,8 +4,8 @@ import weakref from helper import UsesQApplication -from PySide.QtGui import QTextBlockUserData, QTextCursor -from PySide.QtWidgets import QTextEdit +from PySide2.QtGui import QTextBlockUserData, QTextCursor +from PySide2.QtWidgets import QTextEdit class TestUserData(QTextBlockUserData): def __init__(self, data): diff --git a/tests/QtGui/bug_836.py b/tests/QtGui/bug_836.py index 1ed83254a..efb409b17 100644 --- a/tests/QtGui/bug_836.py +++ b/tests/QtGui/bug_836.py @@ -1,5 +1,5 @@ -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * class Mixin1(object): pass diff --git a/tests/QtGui/bug_844.py b/tests/QtGui/bug_844.py index a1cffc399..db05d7e08 100644 --- a/tests/QtGui/bug_844.py +++ b/tests/QtGui/bug_844.py @@ -1,5 +1,5 @@ -from PySide.QtWidgets import * -from PySide.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtCore import * class QtKeyPressListener(QObject): def __init__(self, obj): diff --git a/tests/QtGui/bug_854.py b/tests/QtGui/bug_854.py index e9554768f..6612f0197 100644 --- a/tests/QtGui/bug_854.py +++ b/tests/QtGui/bug_854.py @@ -1,5 +1,5 @@ -from PySide.QtWidgets import QTableView, QVBoxLayout, QApplication -from PySide.QtCore import QAbstractItemModel +from PySide2.QtWidgets import QTableView, QVBoxLayout, QApplication +from PySide2.QtCore import QAbstractItemModel from helper import UsesQApplication import unittest diff --git a/tests/QtGui/bug_860.py b/tests/QtGui/bug_860.py index 5ab8ee975..f2b479f82 100644 --- a/tests/QtGui/bug_860.py +++ b/tests/QtGui/bug_860.py @@ -2,8 +2,8 @@ import sys import unittest -from PySide.QtCore import QSignalMapper -from PySide.QtWidgets import QCheckBox +from PySide2.QtCore import QSignalMapper +from PySide2.QtWidgets import QCheckBox from helper import UsesQApplication diff --git a/tests/QtGui/bug_862.py b/tests/QtGui/bug_862.py index 4e6909209..b4085846b 100644 --- a/tests/QtGui/bug_862.py +++ b/tests/QtGui/bug_862.py @@ -1,7 +1,7 @@ -from PySide.QtCore import QObject -from PySide.QtWidgets import * -import PySide.QtCore +from PySide2.QtCore import QObject +from PySide2.QtWidgets import * +import PySide2.QtCore import unittest class MyQObject(QObject): @@ -31,10 +31,10 @@ class TestRepr (unittest.TestCase): self.assertEqual("<__main__.MyQGraphicsObject(this = 0x", repr(MyQGraphicsObject())[:37]) self.assertEqual("<__main__.MyQGraphicsItem(this = 0x", repr(MyQGraphicsItem())[:35]) - self.assertEqual("<PySide.QtCore.QObject object at ", repr(QObject())[:33]) - self.assertEqual("<PySide.QtCore.QObject object at ", repr(PySide.QtCore.QObject())[:33]) - self.assertEqual("<PySide.QtGui.QWidget object at ", repr(QWidget())[:32]) - self.assertEqual("<PySide.QtGui.QGraphicsWidget(this = 0x", repr(QGraphicsWidget())[:39]) + self.assertEqual("<PySide2.QtCore.QObject object at ", repr(QObject())[:33]) + self.assertEqual("<PySide2.QtCore.QObject object at ", repr(PySide2.QtCore.QObject())[:33]) + self.assertEqual("<PySide2.QtGui.QWidget object at ", repr(QWidget())[:32]) + self.assertEqual("<PySide2.QtGui.QGraphicsWidget(this = 0x", repr(QGraphicsWidget())[:39]) if __name__ == "__main__": unittest.main() diff --git a/tests/QtGui/bug_871.py b/tests/QtGui/bug_871.py index affe5d9d9..b7c177877 100644 --- a/tests/QtGui/bug_871.py +++ b/tests/QtGui/bug_871.py @@ -1,7 +1,7 @@ import unittest from helper import UsesQApplication -from PySide.QtGui import QValidator, QIntValidator -from PySide.QtWidgets import QLineEdit +from PySide2.QtGui import QValidator, QIntValidator +from PySide2.QtWidgets import QLineEdit '''Bug #871 - http://bugs.pyside.org/show_bug.cgi?id=871''' diff --git a/tests/QtGui/bug_879.py b/tests/QtGui/bug_879.py index 026a8248a..31fc8cf0f 100644 --- a/tests/QtGui/bug_879.py +++ b/tests/QtGui/bug_879.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * class MySpinBox(QSpinBox): diff --git a/tests/QtGui/bug_882.py b/tests/QtGui/bug_882.py index 2183204dd..7784095fd 100644 --- a/tests/QtGui/bug_882.py +++ b/tests/QtGui/bug_882.py @@ -1,5 +1,5 @@ -from PySide.QtWidgets import * -from PySide.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtCore import * import os if "DISPLAY" in os.environ: diff --git a/tests/QtGui/bug_919.py b/tests/QtGui/bug_919.py index a3061dfcc..df5bd1ec4 100644 --- a/tests/QtGui/bug_919.py +++ b/tests/QtGui/bug_919.py @@ -1,8 +1,8 @@ import unittest from helper import TimedQApplication -from PySide.QtGui import QPainter -from PySide.QtWidgets import QPushButton, QStyleOptionButton, QApplication, QStyle +from PySide2.QtGui import QPainter +from PySide2.QtWidgets import QPushButton, QStyleOptionButton, QApplication, QStyle class MyWidget(QPushButton): def __init__(self, parent = None): diff --git a/tests/QtGui/bug_921.py b/tests/QtGui/bug_921.py index b43f5b3d2..0f736ff60 100644 --- a/tests/QtGui/bug_921.py +++ b/tests/QtGui/bug_921.py @@ -2,8 +2,8 @@ import unittest -import PySide.QtCore as QtCore -import PySide.QtGui as QtGui +import PySide2.QtCore as QtCore +import PySide2.QtGui as QtGui from helper import TimedQApplication diff --git a/tests/QtGui/bug_941.py b/tests/QtGui/bug_941.py index 23dacd58e..692302dd2 100644 --- a/tests/QtGui/bug_941.py +++ b/tests/QtGui/bug_941.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * def foo(a, b): pass diff --git a/tests/QtGui/bug_964.py b/tests/QtGui/bug_964.py index 36f980dd6..492a4be6d 100644 --- a/tests/QtGui/bug_964.py +++ b/tests/QtGui/bug_964.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import * -from PySide.QtGui import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtGui import * +from PySide2.QtWidgets import * class TestBug964 (unittest.TestCase): diff --git a/tests/QtGui/bug_967.py b/tests/QtGui/bug_967.py index d24eb9143..55ea97fa5 100644 --- a/tests/QtGui/bug_967.py +++ b/tests/QtGui/bug_967.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtWidgets import * +from PySide2.QtWidgets import * class TestBug967 (unittest.TestCase): diff --git a/tests/QtGui/bug_972.py b/tests/QtGui/bug_972.py index f3e68d254..6e1a710ea 100644 --- a/tests/QtGui/bug_972.py +++ b/tests/QtGui/bug_972.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import QSizeF -from PySide.QtWidgets import QGraphicsProxyWidget, QSizePolicy, QPushButton, QGraphicsScene, QGraphicsView +from PySide2.QtCore import QSizeF +from PySide2.QtWidgets import QGraphicsProxyWidget, QSizePolicy, QPushButton, QGraphicsScene, QGraphicsView from helper import TimedQApplication diff --git a/tests/QtGui/bug_979.py b/tests/QtGui/bug_979.py index b2eb7ed9f..b58fcac59 100644 --- a/tests/QtGui/bug_979.py +++ b/tests/QtGui/bug_979.py @@ -1,4 +1,4 @@ -from PySide.QtWidgets import QDialog +from PySide2.QtWidgets import QDialog from import_test import PysideImportTest2 class PysideImportTest1(QDialog, PysideImportTest2): diff --git a/tests/QtGui/bug_988.py b/tests/QtGui/bug_988.py index 7d886af2f..abb965fe5 100644 --- a/tests/QtGui/bug_988.py +++ b/tests/QtGui/bug_988.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtWidgets import * +from PySide2.QtWidgets import * class TestBug988 (unittest.TestCase): diff --git a/tests/QtGui/bug_991.py b/tests/QtGui/bug_991.py index 55ff81d54..8feeac331 100644 --- a/tests/QtGui/bug_991.py +++ b/tests/QtGui/bug_991.py @@ -1,15 +1,15 @@ import unittest -from PySide.QtCore import QObject -from PySide.QtGui import QPen, QBrush +from PySide2.QtCore import QObject +from PySide2.QtGui import QPen, QBrush class TestBug991 (unittest.TestCase): def testReprFunction(self): reprPen = repr(QPen()) - self.assertTrue(reprPen.startswith("<PySide.QtGui.QPen")) + self.assertTrue(reprPen.startswith("<PySide2.QtGui.QPen")) reprBrush = repr(QBrush()) - self.assertTrue(reprBrush.startswith("<PySide.QtGui.QBrush")) + self.assertTrue(reprBrush.startswith("<PySide2.QtGui.QBrush")) reprObject = repr(QObject()) - self.assertTrue(reprObject.startswith("<PySide.QtCore.QObject")) + self.assertTrue(reprObject.startswith("<PySide2.QtCore.QObject")) if __name__ == '__main__': unittest.main() diff --git a/tests/QtGui/bug_998.py b/tests/QtGui/bug_998.py index b592cc92d..90c9240c9 100644 --- a/tests/QtGui/bug_998.py +++ b/tests/QtGui/bug_998.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtWidgets import QApplication +from PySide2.QtWidgets import QApplication class TestBug998 (unittest.TestCase): def testNoFocusWindow(self): diff --git a/tests/QtGui/bug_PYSIDE-41.py b/tests/QtGui/bug_PYSIDE-41.py index 0ca7d908e..c4b5c391e 100644 --- a/tests/QtGui/bug_PYSIDE-41.py +++ b/tests/QtGui/bug_PYSIDE-41.py @@ -4,8 +4,8 @@ import unittest -from PySide.QtCore import * -from PySide.QtGui import * +from PySide2.QtCore import * +from PySide2.QtGui import * class TestBugPYSIDE41(unittest.TestCase): diff --git a/tests/QtGui/customproxywidget_test.py b/tests/QtGui/customproxywidget_test.py index 41838e35a..76e81065e 100644 --- a/tests/QtGui/customproxywidget_test.py +++ b/tests/QtGui/customproxywidget_test.py @@ -1,10 +1,10 @@ import unittest from helper import UsesQApplication -from PySide.QtCore import Qt, QTimer -from PySide.QtGui import QPainter -from PySide.QtWidgets import QLabel -from PySide.QtWidgets import QGraphicsScene, QGraphicsView, QGraphicsItem, QGraphicsProxyWidget +from PySide2.QtCore import Qt, QTimer +from PySide2.QtGui import QPainter +from PySide2.QtWidgets import QLabel +from PySide2.QtWidgets import QGraphicsScene, QGraphicsView, QGraphicsItem, QGraphicsProxyWidget class CustomProxy(QGraphicsProxyWidget): def __init__(self, parent=None, wFlags=0): diff --git a/tests/QtGui/deepcopy_test.py b/tests/QtGui/deepcopy_test.py index 1f53d45f9..0ee4ebed7 100644 --- a/tests/QtGui/deepcopy_test.py +++ b/tests/QtGui/deepcopy_test.py @@ -2,14 +2,14 @@ import unittest from copy import deepcopy -from PySide.QtCore import QPoint -from PySide.QtGui import QMatrix -from PySide.QtGui import QMatrix2x2, QMatrix2x3, QMatrix2x4 -from PySide.QtGui import QMatrix3x2, QMatrix3x3, QMatrix3x4 -from PySide.QtGui import QMatrix4x2, QMatrix4x3, QMatrix4x4 -from PySide.QtGui import QVector2D, QVector3D, QVector4D -from PySide.QtGui import QColor, QTransform, QKeySequence, QQuaternion -from PySide.QtGui import QPolygon +from PySide2.QtCore import QPoint +from PySide2.QtGui import QMatrix +from PySide2.QtGui import QMatrix2x2, QMatrix2x3, QMatrix2x4 +from PySide2.QtGui import QMatrix3x2, QMatrix3x3, QMatrix3x4 +from PySide2.QtGui import QMatrix4x2, QMatrix4x3, QMatrix4x4 +from PySide2.QtGui import QVector2D, QVector3D, QVector4D +from PySide2.QtGui import QColor, QTransform, QKeySequence, QQuaternion +from PySide2.QtGui import QPolygon class DeepCopyHelper: def testCopy(self): diff --git a/tests/QtGui/event_filter_test.py b/tests/QtGui/event_filter_test.py index 23626eb53..0c890017d 100644 --- a/tests/QtGui/event_filter_test.py +++ b/tests/QtGui/event_filter_test.py @@ -2,8 +2,8 @@ import unittest import sys from helper import UsesQApplication -from PySide.QtCore import QObject, QEvent -from PySide.QtWidgets import QWidget +from PySide2.QtCore import QObject, QEvent +from PySide2.QtWidgets import QWidget class MyFilter(QObject): def eventFilter(self, obj, event): diff --git a/tests/QtGui/float_to_int_implicit_conversion_test.py b/tests/QtGui/float_to_int_implicit_conversion_test.py index cc7d18fd9..f77a69ce4 100644 --- a/tests/QtGui/float_to_int_implicit_conversion_test.py +++ b/tests/QtGui/float_to_int_implicit_conversion_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtGui import QImage, qRgb +from PySide2.QtGui import QImage, qRgb from helper import UsesQApplication diff --git a/tests/QtGui/grandparent_method_test.py b/tests/QtGui/grandparent_method_test.py index 37e552358..dfa6d70e4 100644 --- a/tests/QtGui/grandparent_method_test.py +++ b/tests/QtGui/grandparent_method_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtWidgets import QPushButton, QWidget +from PySide2.QtWidgets import QPushButton, QWidget from helper import UsesQApplication diff --git a/tests/QtGui/hashabletype_test.py b/tests/QtGui/hashabletype_test.py index 87aeea0c0..3afb67886 100644 --- a/tests/QtGui/hashabletype_test.py +++ b/tests/QtGui/hashabletype_test.py @@ -2,7 +2,7 @@ import unittest -from PySide.QtWidgets import QTreeWidgetItem +from PySide2.QtWidgets import QTreeWidgetItem from helper import UsesQApplication class HashableTest(UsesQApplication): diff --git a/tests/QtGui/keep_reference_test.py b/tests/QtGui/keep_reference_test.py index e6d8fd2c9..aca6979f0 100644 --- a/tests/QtGui/keep_reference_test.py +++ b/tests/QtGui/keep_reference_test.py @@ -4,8 +4,8 @@ import unittest from sys import getrefcount from helper import UsesQApplication -from PySide.QtCore import * -from PySide.QtWidgets import QTableView +from PySide2.QtCore import * +from PySide2.QtWidgets import QTableView class TestModel(QAbstractTableModel): def __init__(self, parent=None): diff --git a/tests/QtGui/paint_event_test.py b/tests/QtGui/paint_event_test.py index b0e318fa4..af1160c57 100644 --- a/tests/QtGui/paint_event_test.py +++ b/tests/QtGui/paint_event_test.py @@ -3,8 +3,8 @@ import unittest -from PySide.QtCore import QTimerEvent -from PySide.QtWidgets import QApplication, QWidget +from PySide2.QtCore import QTimerEvent +from PySide2.QtWidgets import QApplication, QWidget from helper import UsesQApplication diff --git a/tests/QtGui/parent_method_test.py b/tests/QtGui/parent_method_test.py index 24cc7ba63..3fe0123bf 100644 --- a/tests/QtGui/parent_method_test.py +++ b/tests/QtGui/parent_method_test.py @@ -1,8 +1,8 @@ import unittest -from PySide.QtCore import QObject, QTimer, QThread -from PySide.QtWidgets import * +from PySide2.QtCore import QObject, QTimer, QThread +from PySide2.QtWidgets import * class Foo(QTableView): def __init__(self, parent=None): diff --git a/tests/QtGui/qabstracttextdocumentlayout_test.py b/tests/QtGui/qabstracttextdocumentlayout_test.py index 24f6b17b3..c8a710acc 100644 --- a/tests/QtGui/qabstracttextdocumentlayout_test.py +++ b/tests/QtGui/qabstracttextdocumentlayout_test.py @@ -1,9 +1,9 @@ import unittest import py3kcompat as py3k -from PySide.QtCore import QSizeF, QTimer -from PySide.QtGui import QTextFormat, QTextCharFormat, QPyTextObject -from PySide.QtWidgets import QTextEdit +from PySide2.QtCore import QSizeF, QTimer +from PySide2.QtGui import QTextFormat, QTextCharFormat, QPyTextObject +from PySide2.QtWidgets import QTextEdit from helper import UsesQApplication class Foo(QPyTextObject): diff --git a/tests/QtGui/qaction_test.py b/tests/QtGui/qaction_test.py index 108800114..74b86e582 100644 --- a/tests/QtGui/qaction_test.py +++ b/tests/QtGui/qaction_test.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtWidgets import QAction, QWidget +from PySide2.QtWidgets import QAction, QWidget from helper import UsesQApplication class QPainterDrawText(UsesQApplication): diff --git a/tests/QtGui/qapp_test.py b/tests/QtGui/qapp_test.py index f9b4c8a20..6fa146c7f 100644 --- a/tests/QtGui/qapp_test.py +++ b/tests/QtGui/qapp_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtWidgets import * +from PySide2.QtWidgets import * class QAppPresence(unittest.TestCase): diff --git a/tests/QtGui/qapplication_exit_segfault_test.py b/tests/QtGui/qapplication_exit_segfault_test.py index 6a9ab6a33..e652e7f1b 100644 --- a/tests/QtGui/qapplication_exit_segfault_test.py +++ b/tests/QtGui/qapplication_exit_segfault_test.py @@ -2,7 +2,7 @@ import unittest import sys -from PySide.QtWidgets import QApplication, QPushButton, QWidget, QSpinBox +from PySide2.QtWidgets import QApplication, QPushButton, QWidget, QSpinBox class QApplicationDelete(unittest.TestCase): '''Test for segfault when deleting a QApplication before a QWidget''' diff --git a/tests/QtGui/qapplication_singleton_test.py b/tests/QtGui/qapplication_singleton_test.py index e9f517c39..ece8a653e 100644 --- a/tests/QtGui/qapplication_singleton_test.py +++ b/tests/QtGui/qapplication_singleton_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtWidgets import QApplication +from PySide2.QtWidgets import QApplication class TestSingleton(unittest.TestCase): def testBasic(self): diff --git a/tests/QtGui/qbrush_test.py b/tests/QtGui/qbrush_test.py index 2cf8579f5..84e8e82af 100644 --- a/tests/QtGui/qbrush_test.py +++ b/tests/QtGui/qbrush_test.py @@ -3,9 +3,9 @@ import unittest -from PySide.QtCore import Qt -from PySide.QtGui import QColor, QBrush -from PySide.QtWidgets import QApplication +from PySide2.QtCore import Qt +from PySide2.QtGui import QColor, QBrush +from PySide2.QtWidgets import QApplication from helper import UsesQApplication diff --git a/tests/QtGui/qcolor_reduce_test.py b/tests/QtGui/qcolor_reduce_test.py index c846ae356..c1d18a201 100644 --- a/tests/QtGui/qcolor_reduce_test.py +++ b/tests/QtGui/qcolor_reduce_test.py @@ -1,6 +1,6 @@ import unittest import pickle -from PySide.QtGui import QColor +from PySide2.QtGui import QColor class TestQColor (unittest.TestCase): def reduceColor(self, c): diff --git a/tests/QtGui/qcolor_test.py b/tests/QtGui/qcolor_test.py index 26f3f4cf7..9ea23a065 100644 --- a/tests/QtGui/qcolor_test.py +++ b/tests/QtGui/qcolor_test.py @@ -3,8 +3,8 @@ import unittest import colorsys import PySide -from PySide.QtCore import Qt -from PySide.QtGui import QColor +from PySide2.QtCore import Qt +from PySide2.QtGui import QColor class QColorGetTest(unittest.TestCase): diff --git a/tests/QtGui/qcursor_test.py b/tests/QtGui/qcursor_test.py index ec758d4f1..3cc054de9 100644 --- a/tests/QtGui/qcursor_test.py +++ b/tests/QtGui/qcursor_test.py @@ -3,7 +3,7 @@ http://bugs.openbossa.org/show_bug.cgi?id=630 ''' import unittest -from PySide.QtGui import QBitmap, QCursor, QPixmap +from PySide2.QtGui import QBitmap, QCursor, QPixmap from helper import UsesQApplication class TestQCursor(UsesQApplication): diff --git a/tests/QtGui/qdatastream_gui_operators_test.py b/tests/QtGui/qdatastream_gui_operators_test.py index dbb638fd3..7335a3316 100644 --- a/tests/QtGui/qdatastream_gui_operators_test.py +++ b/tests/QtGui/qdatastream_gui_operators_test.py @@ -3,8 +3,8 @@ import unittest import sys -from PySide.QtCore import QDataStream, QByteArray, QIODevice, Qt -from PySide.QtGui import QPixmap, QColor +from PySide2.QtCore import QDataStream, QByteArray, QIODevice, Qt +from PySide2.QtGui import QPixmap, QColor from helper import UsesQApplication diff --git a/tests/QtGui/qdynamic_signal.py b/tests/QtGui/qdynamic_signal.py index 2ff5fa2fe..0f1b5ee24 100644 --- a/tests/QtGui/qdynamic_signal.py +++ b/tests/QtGui/qdynamic_signal.py @@ -1,8 +1,8 @@ import unittest -from PySide.QtCore import QObject -from PySide.QtWidgets import QInputDialog +from PySide2.QtCore import QObject +from PySide2.QtWidgets import QInputDialog from helper import UsesQApplication diff --git a/tests/QtGui/qfontmetrics_test.py b/tests/QtGui/qfontmetrics_test.py index 59f01f9e7..e6d1e769c 100644 --- a/tests/QtGui/qfontmetrics_test.py +++ b/tests/QtGui/qfontmetrics_test.py @@ -3,8 +3,8 @@ and QFontMetricsF''' import unittest -from PySide.QtGui import QFont, QFontMetrics, QFontMetricsF -from PySide.QtCore import QRect, QRectF, Qt, QSize, QSizeF +from PySide2.QtGui import QFont, QFontMetrics, QFontMetricsF +from PySide2.QtCore import QRect, QRectF, Qt, QSize, QSizeF from helper import UsesQApplication diff --git a/tests/QtGui/qformlayout_test.py b/tests/QtGui/qformlayout_test.py index 0bd703886..4667df5aa 100644 --- a/tests/QtGui/qformlayout_test.py +++ b/tests/QtGui/qformlayout_test.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtWidgets import QFormLayout, QWidget +from PySide2.QtWidgets import QFormLayout, QWidget from helper import UsesQApplication diff --git a/tests/QtGui/qgraphicsitem_test.py b/tests/QtGui/qgraphicsitem_test.py index bcbed27ac..d68cb3b97 100644 --- a/tests/QtGui/qgraphicsitem_test.py +++ b/tests/QtGui/qgraphicsitem_test.py @@ -3,8 +3,8 @@ import unittest -from PySide.QtGui import QPolygonF, QColor, QBrush -from PySide.QtWidgets import QGraphicsScene +from PySide2.QtGui import QPolygonF, QColor, QBrush +from PySide2.QtWidgets import QGraphicsScene from helper import UsesQApplication diff --git a/tests/QtGui/qgraphicsproxywidget_test.py b/tests/QtGui/qgraphicsproxywidget_test.py index e8bbb4322..46dfe96c1 100644 --- a/tests/QtGui/qgraphicsproxywidget_test.py +++ b/tests/QtGui/qgraphicsproxywidget_test.py @@ -1,10 +1,10 @@ import unittest from helper import UsesQApplication -from PySide.QtCore import Qt, QTimer -from PySide.QtGui import QPainter -from PySide.QtWidgets import QLabel -from PySide.QtWidgets import QGraphicsScene, QGraphicsView, QGraphicsItem, QGraphicsProxyWidget +from PySide2.QtCore import Qt, QTimer +from PySide2.QtGui import QPainter +from PySide2.QtWidgets import QLabel +from PySide2.QtWidgets import QGraphicsScene, QGraphicsView, QGraphicsItem, QGraphicsProxyWidget class QGraphicsProxyWidgetTest(UsesQApplication): def testQGraphicsProxyWidget(self): diff --git a/tests/QtGui/qgraphicsscene_test.py b/tests/QtGui/qgraphicsscene_test.py index b20ee7d4a..a99878343 100644 --- a/tests/QtGui/qgraphicsscene_test.py +++ b/tests/QtGui/qgraphicsscene_test.py @@ -4,15 +4,15 @@ import unittest import gc -from PySide.QtCore import QPointF -from PySide.QtGui import QPolygonF, QPixmap, QPainterPath -from PySide.QtWidgets import QApplication, QPushButton -from PySide.QtWidgets import QGraphicsScene -from PySide.QtWidgets import QGraphicsEllipseItem, QGraphicsLineItem -from PySide.QtWidgets import QGraphicsPathItem, QGraphicsPixmapItem -from PySide.QtWidgets import QGraphicsPolygonItem, QGraphicsRectItem -from PySide.QtWidgets import QGraphicsSimpleTextItem, QGraphicsTextItem -from PySide.QtWidgets import QGraphicsProxyWidget +from PySide2.QtCore import QPointF +from PySide2.QtGui import QPolygonF, QPixmap, QPainterPath +from PySide2.QtWidgets import QApplication, QPushButton +from PySide2.QtWidgets import QGraphicsScene +from PySide2.QtWidgets import QGraphicsEllipseItem, QGraphicsLineItem +from PySide2.QtWidgets import QGraphicsPathItem, QGraphicsPixmapItem +from PySide2.QtWidgets import QGraphicsPolygonItem, QGraphicsRectItem +from PySide2.QtWidgets import QGraphicsSimpleTextItem, QGraphicsTextItem +from PySide2.QtWidgets import QGraphicsProxyWidget from helper import UsesQApplication diff --git a/tests/QtGui/qicon_test.py b/tests/QtGui/qicon_test.py index 738e72c50..f3bc98fdb 100644 --- a/tests/QtGui/qicon_test.py +++ b/tests/QtGui/qicon_test.py @@ -2,7 +2,7 @@ import unittest from helper import TimedQApplication -from PySide.QtGui import QIcon +from PySide2.QtGui import QIcon class QIconCtorWithNoneTest(TimedQApplication): diff --git a/tests/QtGui/qimage_test.py b/tests/QtGui/qimage_test.py index 4e108a318..b8a6a85a0 100644 --- a/tests/QtGui/qimage_test.py +++ b/tests/QtGui/qimage_test.py @@ -3,8 +3,8 @@ import unittest import py3kcompat as py3k -from PySide.QtGui import * -from PySide.QtWidgets import * +from PySide2.QtGui import * +from PySide2.QtWidgets import * from helper import UsesQApplication, adjust_filename xpm = [ diff --git a/tests/QtGui/qinputcontext_test.py b/tests/QtGui/qinputcontext_test.py index 12a782c0a..e6106d5ef 100644 --- a/tests/QtGui/qinputcontext_test.py +++ b/tests/QtGui/qinputcontext_test.py @@ -1,8 +1,8 @@ import unittest -from PySide.QtCore import Qt -from PySide.QtWidgets import QPushButton +from PySide2.QtCore import Qt +from PySide2.QtWidgets import QPushButton from helper import UsesQApplication class QInputContextTest(UsesQApplication): diff --git a/tests/QtGui/qitemselection_test.py b/tests/QtGui/qitemselection_test.py index 8c6c34e03..7d35235ce 100644 --- a/tests/QtGui/qitemselection_test.py +++ b/tests/QtGui/qitemselection_test.py @@ -1,7 +1,7 @@ import unittest from helper import UsesQApplication -from PySide.QtGui import QItemSelection, QStandardItemModel +from PySide2.QtGui import QItemSelection, QStandardItemModel class QItemSelectionTest(UsesQApplication): def testLen(self): diff --git a/tests/QtGui/qkeysequence_test.py b/tests/QtGui/qkeysequence_test.py index 8a5c3a401..2e1daed4f 100644 --- a/tests/QtGui/qkeysequence_test.py +++ b/tests/QtGui/qkeysequence_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import Qt -from PySide.QtGui import QKeySequence +from PySide2.QtCore import Qt +from PySide2.QtGui import QKeySequence from helper import UsesQApplication diff --git a/tests/QtGui/qlayout_ref_test.py b/tests/QtGui/qlayout_ref_test.py index 5edde2164..bfc4acffe 100644 --- a/tests/QtGui/qlayout_ref_test.py +++ b/tests/QtGui/qlayout_ref_test.py @@ -4,9 +4,9 @@ import unittest from sys import getrefcount -from PySide.QtWidgets import QHBoxLayout, QVBoxLayout, QGridLayout, QWidget -from PySide.QtWidgets import QStackedLayout, QFormLayout -from PySide.QtWidgets import QApplication, QPushButton, QLabel +from PySide2.QtWidgets import QHBoxLayout, QVBoxLayout, QGridLayout, QWidget +from PySide2.QtWidgets import QStackedLayout, QFormLayout +from PySide2.QtWidgets import QApplication, QPushButton, QLabel from helper import UsesQApplication diff --git a/tests/QtGui/qlayout_test.py b/tests/QtGui/qlayout_test.py index 4392a10f9..bdeee366d 100644 --- a/tests/QtGui/qlayout_test.py +++ b/tests/QtGui/qlayout_test.py @@ -2,8 +2,8 @@ import unittest import sys from helper import UsesQApplication -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * class MyLayout(QLayout): def __init__(self, parent=None): diff --git a/tests/QtGui/qlcdnumber_test.py b/tests/QtGui/qlcdnumber_test.py index 34101567a..4ef128d35 100644 --- a/tests/QtGui/qlcdnumber_test.py +++ b/tests/QtGui/qlcdnumber_test.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtWidgets import QApplication, QLCDNumber +from PySide2.QtWidgets import QApplication, QLCDNumber class QLCDNumberOverflow(unittest.TestCase): '''Test case for unhandled overflow on QLCDNumber() numDigits argument (see bug #215).''' diff --git a/tests/QtGui/qmatrix_test.py b/tests/QtGui/qmatrix_test.py index d1fa91ec6..6fab5f17b 100644 --- a/tests/QtGui/qmatrix_test.py +++ b/tests/QtGui/qmatrix_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import QPoint -from PySide.QtGui import QMatrix, QMatrix4x4 +from PySide2.QtCore import QPoint +from PySide2.QtGui import QMatrix, QMatrix4x4 def qpointTimesQMatrix(point, matrix): diff --git a/tests/QtGui/qmenu_test.py b/tests/QtGui/qmenu_test.py index 16c5c12cf..9dc0fd031 100644 --- a/tests/QtGui/qmenu_test.py +++ b/tests/QtGui/qmenu_test.py @@ -1,9 +1,9 @@ import unittest -from PySide.QtWidgets import QMenu -from PySide.QtGui import QKeySequence, QIcon -from PySide.QtCore import SLOT +from PySide2.QtWidgets import QMenu +from PySide2.QtGui import QKeySequence, QIcon +from PySide2.QtCore import SLOT from helper import UsesQApplication diff --git a/tests/QtGui/qobject_mi_test.py b/tests/QtGui/qobject_mi_test.py index 8310a8d0d..d6cf15f3b 100644 --- a/tests/QtGui/qobject_mi_test.py +++ b/tests/QtGui/qobject_mi_test.py @@ -2,9 +2,9 @@ import unittest -from PySide.QtCore import QObject -from PySide.QtGui import * -from PySide.QtWidgets import * +from PySide2.QtCore import QObject +from PySide2.QtGui import * +from PySide2.QtWidgets import * from helper import UsesQApplication diff --git a/tests/QtGui/qpainter_test.py b/tests/QtGui/qpainter_test.py index f86718efa..b0cbf95af 100644 --- a/tests/QtGui/qpainter_test.py +++ b/tests/QtGui/qpainter_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtGui import QPainter, QLinearGradient -from PySide.QtCore import QLine, QLineF, QPoint, QPointF, QRect, QRectF, Qt +from PySide2.QtGui import QPainter, QLinearGradient +from PySide2.QtCore import QLine, QLineF, QPoint, QPointF, QRect, QRectF, Qt class QPainterDrawText(unittest.TestCase): diff --git a/tests/QtGui/qpen_test.py b/tests/QtGui/qpen_test.py index bceb9ef21..473714fbb 100644 --- a/tests/QtGui/qpen_test.py +++ b/tests/QtGui/qpen_test.py @@ -2,9 +2,9 @@ import unittest from helper import UsesQApplication -from PySide.QtCore import Qt, QTimer -from PySide.QtGui import QPen, QPainter -from PySide.QtWidgets import QWidget +from PySide2.QtCore import Qt, QTimer +from PySide2.QtGui import QPen, QPainter +from PySide2.QtWidgets import QWidget class Painting(QWidget): def __init__(self): diff --git a/tests/QtGui/qpicture_test.py b/tests/QtGui/qpicture_test.py index de0efc6aa..fda07b119 100644 --- a/tests/QtGui/qpicture_test.py +++ b/tests/QtGui/qpicture_test.py @@ -2,9 +2,9 @@ import unittest import os from helper import UsesQApplication -from PySide.QtCore import QTimer -from PySide.QtGui import QPicture, QPainter -from PySide.QtWidgets import QWidget +from PySide2.QtCore import QTimer +from PySide2.QtGui import QPicture, QPainter +from PySide2.QtWidgets import QWidget class MyWidget(QWidget): def paintEvent(self, e): diff --git a/tests/QtGui/qpixmap_constructor.py b/tests/QtGui/qpixmap_constructor.py index 2e5e568a0..13cf6cf42 100644 --- a/tests/QtGui/qpixmap_constructor.py +++ b/tests/QtGui/qpixmap_constructor.py @@ -2,8 +2,8 @@ import unittest -from PySide.QtGui import QPixmap -from PySide.QtWidgets import QLabel +from PySide2.QtGui import QPixmap +from PySide2.QtWidgets import QLabel from helper import UsesQApplication diff --git a/tests/QtGui/qpixmap_test.py b/tests/QtGui/qpixmap_test.py index 1a0339f68..77b7e43e5 100644 --- a/tests/QtGui/qpixmap_test.py +++ b/tests/QtGui/qpixmap_test.py @@ -2,8 +2,8 @@ import unittest import os from helper import UsesQApplication -from PySide.QtGui import * -from PySide.QtCore import * +from PySide2.QtGui import * +from PySide2.QtCore import * class QPixmapTest(UsesQApplication): def testQVariantConstructor(self): diff --git a/tests/QtGui/qpixmapcache_test.py b/tests/QtGui/qpixmapcache_test.py index 7795b5df0..cb8082d8e 100644 --- a/tests/QtGui/qpixmapcache_test.py +++ b/tests/QtGui/qpixmapcache_test.py @@ -1,6 +1,6 @@ import unittest from helper import UsesQApplication -from PySide.QtGui import QPixmapCache, QPixmap +from PySide2.QtGui import QPixmapCache, QPixmap class QPixmapCacheTest(UsesQApplication): diff --git a/tests/QtGui/qpolygonf_test.py b/tests/QtGui/qpolygonf_test.py index f842eb43b..6a616b50d 100644 --- a/tests/QtGui/qpolygonf_test.py +++ b/tests/QtGui/qpolygonf_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import * -from PySide.QtGui import * +from PySide2.QtCore import * +from PySide2.QtGui import * class QPolygonFNotIterableTest(unittest.TestCase): """Test if a QPolygonF is iterable""" diff --git a/tests/QtGui/qpushbutton_test.py b/tests/QtGui/qpushbutton_test.py index a19e28072..d9e6f29d1 100644 --- a/tests/QtGui/qpushbutton_test.py +++ b/tests/QtGui/qpushbutton_test.py @@ -1,8 +1,8 @@ import unittest from helper import UsesQApplication -from PySide.QtWidgets import QPushButton, QMenu, QWidget -from PySide.QtCore import QTimer +from PySide2.QtWidgets import QPushButton, QMenu, QWidget +from PySide2.QtCore import QTimer class MyWidget(QWidget): def __init__(self): diff --git a/tests/QtGui/qradialgradient_test.py b/tests/QtGui/qradialgradient_test.py index 0c582c341..1067defa4 100644 --- a/tests/QtGui/qradialgradient_test.py +++ b/tests/QtGui/qradialgradient_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtGui import QRadialGradient -from PySide.QtCore import QPointF +from PySide2.QtGui import QRadialGradient +from PySide2.QtCore import QPointF class QRadialGradientConstructor(unittest.TestCase): def _compare(self, qptf, tpl): diff --git a/tests/QtGui/qregion_test.py b/tests/QtGui/qregion_test.py index 2274d5e92..e8e080b00 100644 --- a/tests/QtGui/qregion_test.py +++ b/tests/QtGui/qregion_test.py @@ -1,8 +1,8 @@ import unittest import sys -from PySide.QtGui import QRegion -from PySide.QtCore import QPoint +from PySide2.QtGui import QRegion +from PySide2.QtCore import QPoint from helper import UsesQApplication class QRegionTest(UsesQApplication): diff --git a/tests/QtGui/qsplitter_test.py b/tests/QtGui/qsplitter_test.py index cacbdefbe..d526a95bd 100644 --- a/tests/QtGui/qsplitter_test.py +++ b/tests/QtGui/qsplitter_test.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtWidgets import QSplitter +from PySide2.QtWidgets import QSplitter from helper import UsesQApplication diff --git a/tests/QtGui/qstandarditemmodel_test.py b/tests/QtGui/qstandarditemmodel_test.py index fced60393..9e3b4bc2e 100644 --- a/tests/QtGui/qstandarditemmodel_test.py +++ b/tests/QtGui/qstandarditemmodel_test.py @@ -1,8 +1,8 @@ import unittest import sys -from PySide.QtGui import QStandardItemModel, QStandardItem -from PySide.QtWidgets import QWidget +from PySide2.QtGui import QStandardItemModel, QStandardItem +from PySide2.QtWidgets import QWidget import shiboken from helper import UsesQApplication diff --git a/tests/QtGui/qstring_qkeysequence_test.py b/tests/QtGui/qstring_qkeysequence_test.py index 483fbca9c..cb4fb65fa 100644 --- a/tests/QtGui/qstring_qkeysequence_test.py +++ b/tests/QtGui/qstring_qkeysequence_test.py @@ -6,8 +6,8 @@ import unittest import py3kcompat as py3k from helper import UsesQApplication -from PySide.QtGui import QKeySequence -from PySide.QtWidgets import QAction +from PySide2.QtGui import QKeySequence +from PySide2.QtWidgets import QAction class QStringQKeySequenceTest(UsesQApplication): '''Tests conversions of QString to and from QKeySequence.''' diff --git a/tests/QtGui/qstyle_test.py b/tests/QtGui/qstyle_test.py index f91e7bff8..127f70f68 100644 --- a/tests/QtGui/qstyle_test.py +++ b/tests/QtGui/qstyle_test.py @@ -2,7 +2,7 @@ import unittest from helper import UsesQApplication -from PySide.QtWidgets import QWidget, QLabel, QFontComboBox, QStyleFactory +from PySide2.QtWidgets import QWidget, QLabel, QFontComboBox, QStyleFactory class SetStyleTest(UsesQApplication): '''Tests setting the same QStyle for all objects in a UI hierarchy.''' diff --git a/tests/QtGui/qtableview_test.py b/tests/QtGui/qtableview_test.py index 743b405c2..060b387bc 100644 --- a/tests/QtGui/qtableview_test.py +++ b/tests/QtGui/qtableview_test.py @@ -1,8 +1,8 @@ import unittest -from PySide.QtCore import QAbstractTableModel -from PySide.QtWidgets import QTableWidget +from PySide2.QtCore import QAbstractTableModel +from PySide2.QtWidgets import QTableWidget from helper import UsesQApplication class QPenTest(UsesQApplication): diff --git a/tests/QtGui/qtabwidget_test.py b/tests/QtGui/qtabwidget_test.py index 6f17fa49c..359ee6b2e 100644 --- a/tests/QtGui/qtabwidget_test.py +++ b/tests/QtGui/qtabwidget_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtWidgets import * +from PySide2.QtWidgets import * from helper import TimedQApplication def makeBug643(tab): diff --git a/tests/QtGui/qtextdocument_undoredo_test.py b/tests/QtGui/qtextdocument_undoredo_test.py index 6943cea85..4cc954744 100644 --- a/tests/QtGui/qtextdocument_undoredo_test.py +++ b/tests/QtGui/qtextdocument_undoredo_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtGui import QTextDocument, QTextCursor +from PySide2.QtGui import QTextDocument, QTextCursor class QTextDocumentTest(unittest.TestCase): diff --git a/tests/QtGui/qtextedit_test.py b/tests/QtGui/qtextedit_test.py index 05de18c7e..b3d53389c 100644 --- a/tests/QtGui/qtextedit_test.py +++ b/tests/QtGui/qtextedit_test.py @@ -2,7 +2,7 @@ import unittest from sys import getrefcount -from PySide.QtWidgets import QTextEdit +from PySide2.QtWidgets import QTextEdit from helper import UsesQApplication diff --git a/tests/QtGui/qtextline_test.py b/tests/QtGui/qtextline_test.py index 76a711e32..c5b792916 100644 --- a/tests/QtGui/qtextline_test.py +++ b/tests/QtGui/qtextline_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtGui import QTextLayout +from PySide2.QtGui import QTextLayout from helper import UsesQApplication class QTextLineTest(UsesQApplication): diff --git a/tests/QtGui/qtoolbar_test.py b/tests/QtGui/qtoolbar_test.py index f6b4d054f..5ce3b1d95 100644 --- a/tests/QtGui/qtoolbar_test.py +++ b/tests/QtGui/qtoolbar_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtWidgets import QToolBar, QMainWindow, QAction +from PySide2.QtWidgets import QToolBar, QMainWindow, QAction from helper import UsesQApplication diff --git a/tests/QtGui/qtoolbox_test.py b/tests/QtGui/qtoolbox_test.py index 80304c772..ecb025176 100644 --- a/tests/QtGui/qtoolbox_test.py +++ b/tests/QtGui/qtoolbox_test.py @@ -1,8 +1,8 @@ import unittest -from PySide.QtGui import QIcon -from PySide.QtWidgets import QToolBox, QWidget +from PySide2.QtGui import QIcon +from PySide2.QtWidgets import QToolBox, QWidget from helper import UsesQApplication diff --git a/tests/QtGui/qtransform_test.py b/tests/QtGui/qtransform_test.py index 8cac92711..1c800fa99 100644 --- a/tests/QtGui/qtransform_test.py +++ b/tests/QtGui/qtransform_test.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import QPointF -from PySide.QtGui import QTransform, QPolygonF, QPolygonF +from PySide2.QtCore import QPointF +from PySide2.QtGui import QTransform, QPolygonF, QPolygonF class QTransformTest(unittest.TestCase): diff --git a/tests/QtGui/qvalidator_test.py b/tests/QtGui/qvalidator_test.py index b7de4987e..71ab36bf3 100644 --- a/tests/QtGui/qvalidator_test.py +++ b/tests/QtGui/qvalidator_test.py @@ -1,6 +1,6 @@ -from PySide.QtCore import * -from PySide.QtGui import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtGui import * +from PySide2.QtWidgets import * import unittest from helper import UsesQApplication diff --git a/tests/QtGui/qvariant_test.py b/tests/QtGui/qvariant_test.py index 3123a76d3..8ab01bf26 100644 --- a/tests/QtGui/qvariant_test.py +++ b/tests/QtGui/qvariant_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * class MyDiagram(QGraphicsScene): pass diff --git a/tests/QtGui/qwidget_setlayout_test.py b/tests/QtGui/qwidget_setlayout_test.py index a82b2dc0a..8d8c9e73f 100644 --- a/tests/QtGui/qwidget_setlayout_test.py +++ b/tests/QtGui/qwidget_setlayout_test.py @@ -2,7 +2,7 @@ import unittest -from PySide.QtWidgets import QWidget, QVBoxLayout, QPushButton, QApplication, QHBoxLayout +from PySide2.QtWidgets import QWidget, QVBoxLayout, QPushButton, QApplication, QHBoxLayout from helper import UsesQApplication class QWidgetTest(UsesQApplication): diff --git a/tests/QtGui/qwidget_test.py b/tests/QtGui/qwidget_test.py index 964cbb883..0f7bdc091 100644 --- a/tests/QtGui/qwidget_test.py +++ b/tests/QtGui/qwidget_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtWidgets import QWidget, QMainWindow +from PySide2.QtWidgets import QWidget, QMainWindow from helper import UsesQApplication class QWidgetInherit(QMainWindow): diff --git a/tests/QtGui/reference_count_test.py b/tests/QtGui/reference_count_test.py index 82370979b..45f9380b2 100644 --- a/tests/QtGui/reference_count_test.py +++ b/tests/QtGui/reference_count_test.py @@ -8,9 +8,9 @@ import weakref import gc -from PySide.QtCore import Qt, QPointF -from PySide.QtGui import QPolygonF -from PySide.QtWidgets import QApplication, QGraphicsScene, QGraphicsRectItem, QGraphicsPolygonItem, QGraphicsRectItem +from PySide2.QtCore import Qt, QPointF +from PySide2.QtGui import QPolygonF +from PySide2.QtWidgets import QApplication, QGraphicsScene, QGraphicsRectItem, QGraphicsPolygonItem, QGraphicsRectItem from helper import UsesQApplication diff --git a/tests/QtGui/repr_test.py b/tests/QtGui/repr_test.py index 3dbe8791e..aa293deb1 100644 --- a/tests/QtGui/repr_test.py +++ b/tests/QtGui/repr_test.py @@ -2,14 +2,14 @@ import unittest import PySide -from PySide.QtCore import QPoint -from PySide.QtGui import QMatrix -from PySide.QtGui import QMatrix2x2, QMatrix2x3, QMatrix2x4 -from PySide.QtGui import QMatrix3x2, QMatrix3x3, QMatrix3x4 -from PySide.QtGui import QMatrix4x2, QMatrix4x3, QMatrix4x4 -from PySide.QtGui import QVector2D, QVector3D, QVector4D -from PySide.QtGui import QColor, QTransform, QKeySequence, QQuaternion -from PySide.QtGui import QPolygon +from PySide2.QtCore import QPoint +from PySide2.QtGui import QMatrix +from PySide2.QtGui import QMatrix2x2, QMatrix2x3, QMatrix2x4 +from PySide2.QtGui import QMatrix3x2, QMatrix3x3, QMatrix3x4 +from PySide2.QtGui import QMatrix4x2, QMatrix4x3, QMatrix4x4 +from PySide2.QtGui import QVector2D, QVector3D, QVector4D +from PySide2.QtGui import QColor, QTransform, QKeySequence, QQuaternion +from PySide2.QtGui import QPolygon class ReprCopyHelper: def testCopy(self): diff --git a/tests/QtGui/returnquadruplesofnumbers_test.py b/tests/QtGui/returnquadruplesofnumbers_test.py index cec3d28e6..1dd1b1404 100644 --- a/tests/QtGui/returnquadruplesofnumbers_test.py +++ b/tests/QtGui/returnquadruplesofnumbers_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtGui import QTextCursor -from PySide.QtPrintSupport import QPrinter -from PySide.QtWidgets import QLayout, QWidget, QGraphicsLayout, QGraphicsLayoutItem +from PySide2.QtGui import QTextCursor +from PySide2.QtPrintSupport import QPrinter +from PySide2.QtWidgets import QLayout, QWidget, QGraphicsLayout, QGraphicsLayoutItem from helper import UsesQApplication diff --git a/tests/QtGui/standardpixmap_test.py b/tests/QtGui/standardpixmap_test.py index 694121dd5..dbbf3a317 100644 --- a/tests/QtGui/standardpixmap_test.py +++ b/tests/QtGui/standardpixmap_test.py @@ -1,8 +1,8 @@ import unittest -from PySide.QtGui import QPixmap -from PySide.QtWidgets import QStyle +from PySide2.QtGui import QPixmap +from PySide2.QtWidgets import QStyle from helper import UsesQApplication diff --git a/tests/QtGui/test_module_template.py b/tests/QtGui/test_module_template.py index 7a386a5c2..40a83d17f 100644 --- a/tests/QtGui/test_module_template.py +++ b/tests/QtGui/test_module_template.py @@ -1,5 +1,5 @@ -from PySide.QtWidgets import QWidget -from PySide.QtCore import QObject +from PySide2.QtWidgets import QWidget +from PySide2.QtCore import QObject class MyQObject(QObject): pass diff --git a/tests/QtGui/virtual_protected_inheritance_test.py b/tests/QtGui/virtual_protected_inheritance_test.py index b597ccd28..8e090a76a 100644 --- a/tests/QtGui/virtual_protected_inheritance_test.py +++ b/tests/QtGui/virtual_protected_inheritance_test.py @@ -3,8 +3,8 @@ import unittest -from PySide.QtCore import QTimerEvent -from PySide.QtWidgets import QApplication, QSpinBox +from PySide2.QtCore import QTimerEvent +from PySide2.QtWidgets import QApplication, QSpinBox from helper import UsesQApplication diff --git a/tests/QtGui/virtual_pure_override_test.py b/tests/QtGui/virtual_pure_override_test.py index 7aced3890..81c31ae0b 100644 --- a/tests/QtGui/virtual_pure_override_test.py +++ b/tests/QtGui/virtual_pure_override_test.py @@ -2,9 +2,9 @@ import unittest -from PySide.QtWidgets import QGraphicsScene, QGraphicsRectItem, QGraphicsView, QApplication -from PySide.QtGui import QBrush, QColor -from PySide.QtCore import QTimer +from PySide2.QtWidgets import QGraphicsScene, QGraphicsRectItem, QGraphicsView, QApplication +from PySide2.QtGui import QBrush, QColor +from PySide2.QtCore import QTimer from helper import UsesQApplication qgraphics_item_painted = False diff --git a/tests/QtGui/x11_symbols_test.py b/tests/QtGui/x11_symbols_test.py index f61499edb..cb0e380be 100644 --- a/tests/QtGui/x11_symbols_test.py +++ b/tests/QtGui/x11_symbols_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtWidgets import * +from PySide2.QtWidgets import * class X11Test(unittest.TestCase): diff --git a/tests/QtHelp/help_test.py b/tests/QtHelp/help_test.py index e2ff532a6..3ae53fa80 100644 --- a/tests/QtHelp/help_test.py +++ b/tests/QtHelp/help_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtHelp import QHelpEngine +from PySide2.QtHelp import QHelpEngine from helper import UsesQApplication diff --git a/tests/QtMultimedia/audio_test.py b/tests/QtMultimedia/audio_test.py index 773524ed2..b831561cf 100644 --- a/tests/QtMultimedia/audio_test.py +++ b/tests/QtMultimedia/audio_test.py @@ -3,8 +3,8 @@ import unittest -from PySide.QtCore import * -from PySide.QtMultimedia import * +from PySide2.QtCore import * +from PySide2.QtMultimedia import * class testAudioDevices(unittest.TestCase): diff --git a/tests/QtNetwork/accessManager_test.py b/tests/QtNetwork/accessManager_test.py index 65a848059..32500944e 100644 --- a/tests/QtNetwork/accessManager_test.py +++ b/tests/QtNetwork/accessManager_test.py @@ -3,8 +3,8 @@ import unittest -from PySide.QtCore import * -from PySide.QtNetwork import * +from PySide2.QtCore import * +from PySide2.QtNetwork import * from helper import UsesQCoreApplication from httpd import TestServer diff --git a/tests/QtNetwork/basic_auth_test.py b/tests/QtNetwork/basic_auth_test.py index 3a78e9a8f..4df1fd3ac 100644 --- a/tests/QtNetwork/basic_auth_test.py +++ b/tests/QtNetwork/basic_auth_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import * -from PySide.QtNetwork import * +from PySide2.QtCore import * +from PySide2.QtNetwork import * from helper import UsesQCoreApplication from httpd import TestServer diff --git a/tests/QtNetwork/bug_446.py b/tests/QtNetwork/bug_446.py index d3a9d0986..206b099b8 100644 --- a/tests/QtNetwork/bug_446.py +++ b/tests/QtNetwork/bug_446.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import * -from PySide.QtNetwork import * +from PySide2.QtCore import * +from PySide2.QtNetwork import * from helper import UsesQCoreApplication diff --git a/tests/QtNetwork/http_test.py b/tests/QtNetwork/http_test.py index b6bfea5ff..7c14b30f9 100644 --- a/tests/QtNetwork/http_test.py +++ b/tests/QtNetwork/http_test.py @@ -3,8 +3,8 @@ import unittest -from PySide.QtCore import * -from PySide.QtNetwork import * +from PySide2.QtCore import * +from PySide2.QtNetwork import * from helper import UsesQCoreApplication from httpd import TestServer diff --git a/tests/QtNetwork/qipv6address_test.py b/tests/QtNetwork/qipv6address_test.py index eeb4c61cb..8abcbc45e 100644 --- a/tests/QtNetwork/qipv6address_test.py +++ b/tests/QtNetwork/qipv6address_test.py @@ -2,7 +2,7 @@ import unittest -from PySide.QtNetwork import * +from PySide2.QtNetwork import * class QIPv6AddressGetItemTest(unittest.TestCase): def testLength(self): diff --git a/tests/QtNetwork/tcpserver_test.py b/tests/QtNetwork/tcpserver_test.py index 77f830e36..aa2b4ac37 100644 --- a/tests/QtNetwork/tcpserver_test.py +++ b/tests/QtNetwork/tcpserver_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtNetwork import QTcpServer +from PySide2.QtNetwork import QTcpServer class ListenDefaultArgsCase(unittest.TestCase): '''Test case for TcpServer.listen with default args''' diff --git a/tests/QtNetwork/udpsocket_test.py b/tests/QtNetwork/udpsocket_test.py index 66f892017..32a91d41e 100644 --- a/tests/QtNetwork/udpsocket_test.py +++ b/tests/QtNetwork/udpsocket_test.py @@ -3,8 +3,8 @@ import unittest -from PySide.QtCore import QUrl, QObject, SIGNAL, QCoreApplication, QTimer -from PySide.QtNetwork import QUdpSocket, QHostAddress +from PySide2.QtCore import QUrl, QObject, SIGNAL, QCoreApplication, QTimer +from PySide2.QtNetwork import QUdpSocket, QHostAddress class HttpSignalsCase(unittest.TestCase): '''Test case for bug #124 - readDatagram signature diff --git a/tests/QtOpenGL/qglbuffer_test.py b/tests/QtOpenGL/qglbuffer_test.py index 8d6d50358..38837a06f 100644 --- a/tests/QtOpenGL/qglbuffer_test.py +++ b/tests/QtOpenGL/qglbuffer_test.py @@ -3,8 +3,8 @@ import unittest -from PySide.QtCore import QByteArray -from PySide.QtOpenGL import QGLBuffer, QGLWidget +from PySide2.QtCore import QByteArray +from PySide2.QtOpenGL import QGLBuffer, QGLWidget import py3kcompat as py3k from helper import UsesQApplication diff --git a/tests/QtOpenGL/qglwidget_test.py b/tests/QtOpenGL/qglwidget_test.py index 46d7816ca..719b7dc31 100644 --- a/tests/QtOpenGL/qglwidget_test.py +++ b/tests/QtOpenGL/qglwidget_test.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtWidgets import * -from PySide.QtOpenGL import * +from PySide2.QtWidgets import * +from PySide2.QtOpenGL import * class TestQGLWidget (unittest.TestCase): def testIt(self): diff --git a/tests/QtScript/bug_1022.py b/tests/QtScript/bug_1022.py index 3a246145a..0ddebac8d 100644 --- a/tests/QtScript/bug_1022.py +++ b/tests/QtScript/bug_1022.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import * -from PySide.QtScript import * +from PySide2.QtCore import * +from PySide2.QtScript import * class QScriptValueTest(unittest.TestCase): def testQScriptValue(self): diff --git a/tests/QtScript/engine_test.py b/tests/QtScript/engine_test.py index 074d3df40..19afdeba9 100644 --- a/tests/QtScript/engine_test.py +++ b/tests/QtScript/engine_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import QObject -from PySide.QtScript import QScriptEngine +from PySide2.QtCore import QObject +from PySide2.QtScript import QScriptEngine class QScriptEngineTest(unittest.TestCase): diff --git a/tests/QtScript/property_test.py b/tests/QtScript/property_test.py index 52c01f7cb..5ef2f9bf4 100644 --- a/tests/QtScript/property_test.py +++ b/tests/QtScript/property_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import QObject, Property, QCoreApplication -from PySide.QtScript import QScriptEngine +from PySide2.QtCore import QObject, Property, QCoreApplication +from PySide2.QtScript import QScriptEngine class MyObject(QObject): def __init__(self, parent = None): diff --git a/tests/QtScript/qscriptvalue_test.py b/tests/QtScript/qscriptvalue_test.py index e5b6a637f..10ae07a00 100644 --- a/tests/QtScript/qscriptvalue_test.py +++ b/tests/QtScript/qscriptvalue_test.py @@ -1,6 +1,6 @@ import unittest import PySide -from PySide.QtScript import * +from PySide2.QtScript import * from helper import UsesQApplication diff --git a/tests/QtScriptTools/debugger_test.py b/tests/QtScriptTools/debugger_test.py index 8805018c6..817690bc8 100644 --- a/tests/QtScriptTools/debugger_test.py +++ b/tests/QtScriptTools/debugger_test.py @@ -1,9 +1,9 @@ import unittest -from PySide.QtCore import SIGNAL, QTimer -from PySide.QtScript import QScriptEngine -from PySide.QtScriptTools import QScriptEngineDebugger +from PySide2.QtCore import SIGNAL, QTimer +from PySide2.QtScript import QScriptEngine +from PySide2.QtScriptTools import QScriptEngineDebugger from helper import UsesQApplication diff --git a/tests/QtSql/bug_1013.py b/tests/QtSql/bug_1013.py index f0cee701f..e95025669 100644 --- a/tests/QtSql/bug_1013.py +++ b/tests/QtSql/bug_1013.py @@ -1,5 +1,5 @@ -from PySide.QtCore import * -from PySide.QtSql import * +from PySide2.QtCore import * +from PySide2.QtSql import * import unittest class TestBug1013 (unittest.TestCase): diff --git a/tests/QtSql/qsqldatabaseandqueries_test.py b/tests/QtSql/qsqldatabaseandqueries_test.py index af0261628..fb25430cb 100644 --- a/tests/QtSql/qsqldatabaseandqueries_test.py +++ b/tests/QtSql/qsqldatabaseandqueries_test.py @@ -5,8 +5,8 @@ import sys import unittest from PySide2 import QtSql -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * class Foo(QWidget): def __init__(self): diff --git a/tests/QtSql/qvarianttype_test.py b/tests/QtSql/qvarianttype_test.py index 5612f89f4..394758ce3 100644 --- a/tests/QtSql/qvarianttype_test.py +++ b/tests/QtSql/qvarianttype_test.py @@ -1,7 +1,7 @@ '''Test cases for QVariant::Type converter''' import unittest import py3kcompat as py3k -from PySide.QtSql import QSqlField +from PySide2.QtSql import QSqlField class QVariantTypeTest(unittest.TestCase): def testQVariantType(self): diff --git a/tests/QtSvg/qsvggenerator_test.py b/tests/QtSvg/qsvggenerator_test.py index cec7fdaff..fe34c8273 100644 --- a/tests/QtSvg/qsvggenerator_test.py +++ b/tests/QtSvg/qsvggenerator_test.py @@ -1,8 +1,8 @@ #!/usr/bin/python import unittest from sys import getrefcount -from PySide.QtCore import QBuffer -from PySide.QtSvg import QSvgGenerator +from PySide2.QtCore import QBuffer +from PySide2.QtSvg import QSvgGenerator class QSvgGeneratorTest(unittest.TestCase): diff --git a/tests/QtSvg/qsvgrenderer_test.py b/tests/QtSvg/qsvgrenderer_test.py index 5ca1e456c..9d5fa9647 100644 --- a/tests/QtSvg/qsvgrenderer_test.py +++ b/tests/QtSvg/qsvgrenderer_test.py @@ -1,8 +1,8 @@ #!/usr/bin/python import unittest, os -from PySide.QtCore import * -from PySide.QtWidgets import * -from PySide.QtSvg import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtSvg import * class QSvgRendererTest(unittest.TestCase): diff --git a/tests/QtSvg/qsvgwidget_test.py b/tests/QtSvg/qsvgwidget_test.py index 65794eef7..3594ac8fd 100644 --- a/tests/QtSvg/qsvgwidget_test.py +++ b/tests/QtSvg/qsvgwidget_test.py @@ -1,8 +1,8 @@ #!/usr/bin/python import unittest, os -from PySide.QtCore import * -from PySide.QtWidgets import * -from PySide.QtSvg import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtSvg import * class QSvgWidgetTest(unittest.TestCase): diff --git a/tests/QtTest/click_test.py b/tests/QtTest/click_test.py index 916d97e3d..7ac0add34 100644 --- a/tests/QtTest/click_test.py +++ b/tests/QtTest/click_test.py @@ -3,9 +3,9 @@ import unittest -from PySide.QtCore import Qt, QObject -from PySide.QtWidgets import QPushButton, QLineEdit -from PySide.QtTest import QTest +from PySide2.QtCore import Qt, QObject +from PySide2.QtWidgets import QPushButton, QLineEdit +from PySide2.QtTest import QTest from helper import UsesQApplication diff --git a/tests/QtTest/eventfilter_test.py b/tests/QtTest/eventfilter_test.py index 65a30f3e8..16ce58373 100644 --- a/tests/QtTest/eventfilter_test.py +++ b/tests/QtTest/eventfilter_test.py @@ -3,9 +3,9 @@ import unittest -from PySide.QtCore import * -from PySide.QtWidgets import * -from PySide.QtTest import QTest +from PySide2.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtTest import QTest from helper import UsesQApplication diff --git a/tests/QtTest/touchevent_test.py b/tests/QtTest/touchevent_test.py index d90f45845..9f3337aae 100644 --- a/tests/QtTest/touchevent_test.py +++ b/tests/QtTest/touchevent_test.py @@ -1,6 +1,6 @@ -from PySide.QtWidgets import QWidget -from PySide.QtCore import QPoint, QTimer, Qt, QEvent -from PySide.QtTest import QTest +from PySide2.QtWidgets import QWidget +from PySide2.QtCore import QPoint, QTimer, Qt, QEvent +from PySide2.QtTest import QTest import unittest diff --git a/tests/QtUiTools/bug_1060.py b/tests/QtUiTools/bug_1060.py index 36b7fd6a8..006b7b0ab 100644 --- a/tests/QtUiTools/bug_1060.py +++ b/tests/QtUiTools/bug_1060.py @@ -1,7 +1,7 @@ ''' unit test for BUG #1060 ''' -from PySide.QtWidgets import QApplication -from PySide.QtUiTools import QUiLoader +from PySide2.QtWidgets import QApplication +from PySide2.QtUiTools import QUiLoader from helper import adjust_filename class MyQUiLoader(QUiLoader): diff --git a/tests/QtUiTools/bug_360.py b/tests/QtUiTools/bug_360.py index 2b8cc76cb..f6f77e858 100644 --- a/tests/QtUiTools/bug_360.py +++ b/tests/QtUiTools/bug_360.py @@ -3,7 +3,7 @@ import os from helper import UsesQApplication from PySide2 import QtCore, QtGui -from PySide.QtUiTools import QUiLoader +from PySide2.QtUiTools import QUiLoader class MyQUiLoader(QUiLoader): def __init__(self, baseinstance): diff --git a/tests/QtUiTools/bug_376.py b/tests/QtUiTools/bug_376.py index e1b95462b..13b2e0cd2 100644 --- a/tests/QtUiTools/bug_376.py +++ b/tests/QtUiTools/bug_376.py @@ -3,7 +3,7 @@ import os from helper import UsesQApplication from PySide2 import QtCore, QtGui -from PySide.QtUiTools import QUiLoader +from PySide2.QtUiTools import QUiLoader class BugTest(UsesQApplication): def testCase(self): diff --git a/tests/QtUiTools/bug_392.py b/tests/QtUiTools/bug_392.py index 1cc431e50..b6719a6e0 100644 --- a/tests/QtUiTools/bug_392.py +++ b/tests/QtUiTools/bug_392.py @@ -3,7 +3,7 @@ import os from helper import UsesQApplication from PySide2 import QtGui -from PySide.QtUiTools import QUiLoader +from PySide2.QtUiTools import QUiLoader class MyWidget(QtGui.QComboBox): def __init__(self, parent=None): diff --git a/tests/QtUiTools/bug_426.py b/tests/QtUiTools/bug_426.py index 8184653dd..e322d92c1 100644 --- a/tests/QtUiTools/bug_426.py +++ b/tests/QtUiTools/bug_426.py @@ -1,7 +1,7 @@ import sys import os from PySide2 import QtCore, QtGui -from PySide.QtUiTools import QUiLoader +from PySide2.QtUiTools import QUiLoader class Window(object): def __init__(self): diff --git a/tests/QtUiTools/bug_552.py b/tests/QtUiTools/bug_552.py index 869c2e529..b62786960 100644 --- a/tests/QtUiTools/bug_552.py +++ b/tests/QtUiTools/bug_552.py @@ -1,6 +1,6 @@ from helper import adjust_filename from PySide2 import QtGui, QtCore -from PySide.QtUiTools import QUiLoader +from PySide2.QtUiTools import QUiLoader class View_1(QtGui.QWidget): diff --git a/tests/QtUiTools/bug_909.py b/tests/QtUiTools/bug_909.py index bf98a5b92..61ca1a50f 100644 --- a/tests/QtUiTools/bug_909.py +++ b/tests/QtUiTools/bug_909.py @@ -1,9 +1,9 @@ import sys import unittest -from PySide.QtCore import QFile -from PySide.QtWidgets import QTabWidget -from PySide.QtUiTools import QUiLoader +from PySide2.QtCore import QFile +from PySide2.QtWidgets import QTabWidget +from PySide2.QtUiTools import QUiLoader from helper import UsesQApplication from helper import adjust_filename diff --git a/tests/QtUiTools/bug_913.py b/tests/QtUiTools/bug_913.py index 41b7e7927..e9721f5c0 100644 --- a/tests/QtUiTools/bug_913.py +++ b/tests/QtUiTools/bug_913.py @@ -5,9 +5,9 @@ import sys import unittest from helper import adjust_filename -from PySide.QtCore import * -from PySide.QtWidgets import * -from PySide.QtUiTools import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtUiTools import * class TestBug913 (unittest.TestCase): diff --git a/tests/QtUiTools/bug_965.py b/tests/QtUiTools/bug_965.py index 4dbd281d6..23459be05 100644 --- a/tests/QtUiTools/bug_965.py +++ b/tests/QtUiTools/bug_965.py @@ -1,4 +1,4 @@ -from PySide.QtUiTools import QUiLoader +from PySide2.QtUiTools import QUiLoader import unittest from helper import UsesQApplication diff --git a/tests/QtUiTools/ui_test.py b/tests/QtUiTools/ui_test.py index 6f599cefb..49b637609 100644 --- a/tests/QtUiTools/ui_test.py +++ b/tests/QtUiTools/ui_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtUiTools import QUiLoader +from PySide2.QtUiTools import QUiLoader from helper import UsesQApplication diff --git a/tests/QtUiTools/uiloader_test.py b/tests/QtUiTools/uiloader_test.py index d019524d4..52f6c43df 100644 --- a/tests/QtUiTools/uiloader_test.py +++ b/tests/QtUiTools/uiloader_test.py @@ -2,8 +2,8 @@ import unittest import os from helper import UsesQApplication -from PySide.QtWidgets import QWidget -from PySide.QtUiTools import QUiLoader +from PySide2.QtWidgets import QWidget +from PySide2.QtUiTools import QUiLoader def get_file_path(): for path in file_path: diff --git a/tests/QtWebKit/bug_448.py b/tests/QtWebKit/bug_448.py index 418d65a48..9fb2d50fe 100644 --- a/tests/QtWebKit/bug_448.py +++ b/tests/QtWebKit/bug_448.py @@ -4,8 +4,8 @@ import unittest import sys -from PySide.QtWidgets import QApplication -from PySide.QtWebKit import QWebView +from PySide2.QtWidgets import QApplication +from PySide2.QtWebKit import QWebView class Bug448(unittest.TestCase): def onError(self, erros): diff --git a/tests/QtWebKit/bug_694.py b/tests/QtWebKit/bug_694.py index 0748515a9..93225a833 100644 --- a/tests/QtWebKit/bug_694.py +++ b/tests/QtWebKit/bug_694.py @@ -1,8 +1,8 @@ import sys import unittest -from PySide.QtCore import * -from PySide.QtWidgets import * -from PySide.QtWebKit import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * +from PySide2.QtWebKit import * class ErrorPage (QWebPage): diff --git a/tests/QtWebKit/bug_803.py b/tests/QtWebKit/bug_803.py index be473993b..37e5cf2b6 100644 --- a/tests/QtWebKit/bug_803.py +++ b/tests/QtWebKit/bug_803.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtWidgets import * -from PySide.QtWebKit import * +from PySide2.QtWidgets import * +from PySide2.QtWebKit import * class TestBug803 (unittest.TestCase): diff --git a/tests/QtWebKit/bug_899.py b/tests/QtWebKit/bug_899.py index f4daaab08..55bb7ac5a 100644 --- a/tests/QtWebKit/bug_899.py +++ b/tests/QtWebKit/bug_899.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import Property, QObject -from PySide.QtWebKit import QWebView +from PySide2.QtCore import Property, QObject +from PySide2.QtWebKit import QWebView from helper import TimedQApplication class TestLambdaPropery(TimedQApplication): diff --git a/tests/QtWebKit/bug_959.py b/tests/QtWebKit/bug_959.py index 740ca3ed3..eb7efc742 100644 --- a/tests/QtWebKit/bug_959.py +++ b/tests/QtWebKit/bug_959.py @@ -1,6 +1,6 @@ -from PySide.QtCore import QObject, Slot, QTimer -from PySide.QtWebKit import QWebView -from PySide.QtWidgets import QApplication +from PySide2.QtCore import QObject, Slot, QTimer +from PySide2.QtWebKit import QWebView +from PySide2.QtWidgets import QApplication from PySide2 import QtCore import sys diff --git a/tests/QtWebKit/qml_plugin_test.py b/tests/QtWebKit/qml_plugin_test.py index 0da71bd5d..6add3edf1 100644 --- a/tests/QtWebKit/qml_plugin_test.py +++ b/tests/QtWebKit/qml_plugin_test.py @@ -3,9 +3,9 @@ import os import sys import unittest -from PySide.QtCore import QUrl, QTimer -from PySide.QtWidgets import QApplication, QLabel -from PySide.QtWebKit import QWebPluginFactory, QWebView, QWebSettings +from PySide2.QtCore import QUrl, QTimer +from PySide2.QtWidgets import QApplication, QLabel +from PySide2.QtWebKit import QWebPluginFactory, QWebView, QWebSettings from helper import UsesQApplication diff --git a/tests/QtWebKit/qvariantlist_property_test.py b/tests/QtWebKit/qvariantlist_property_test.py index 33ffc1d2d..710c6da2b 100644 --- a/tests/QtWebKit/qvariantlist_property_test.py +++ b/tests/QtWebKit/qvariantlist_property_test.py @@ -1,6 +1,6 @@ import unittest -from PySide.QtCore import Property, QObject -from PySide.QtWebKit import QWebView +from PySide2.QtCore import Property, QObject +from PySide2.QtWebKit import QWebView from helper import TimedQApplication class TestLoadFinished(TimedQApplication): diff --git a/tests/QtWebKit/webframe_test.py b/tests/QtWebKit/webframe_test.py index 596617d4f..8bdeb1ee1 100644 --- a/tests/QtWebKit/webframe_test.py +++ b/tests/QtWebKit/webframe_test.py @@ -1,9 +1,9 @@ import unittest import sys -from PySide.QtCore import QObject, SIGNAL, QUrl -from PySide.QtWebKit import * -from PySide.QtNetwork import QNetworkRequest +from PySide2.QtCore import QObject, SIGNAL, QUrl +from PySide2.QtWebKit import * +from PySide2.QtNetwork import QNetworkRequest from helper import adjust_filename, UsesQApplication diff --git a/tests/QtWebKit/webpage_test.py b/tests/QtWebKit/webpage_test.py index 20796971f..07ddc5a4d 100644 --- a/tests/QtWebKit/webpage_test.py +++ b/tests/QtWebKit/webpage_test.py @@ -3,9 +3,9 @@ import unittest -from PySide.QtCore import QObject, SIGNAL, QUrl -from PySide.QtWebKit import QWebPage -from PySide.QtNetwork import QNetworkAccessManager +from PySide2.QtCore import QObject, SIGNAL, QUrl +from PySide2.QtWebKit import QWebPage +from PySide2.QtNetwork import QNetworkAccessManager from helper import adjust_filename, TimedQApplication diff --git a/tests/QtWebKit/webview_test.py b/tests/QtWebKit/webview_test.py index 591d07242..ad1c5232a 100644 --- a/tests/QtWebKit/webview_test.py +++ b/tests/QtWebKit/webview_test.py @@ -5,9 +5,9 @@ import unittest import py3kcompat as py3k import sys -from PySide.QtCore import QObject, SIGNAL, QUrl -from PySide.QtWebKit import QWebPage, QWebView -from PySide.QtNetwork import QNetworkRequest +from PySide2.QtCore import QObject, SIGNAL, QUrl +from PySide2.QtWebKit import QWebPage, QWebView +from PySide2.QtNetwork import QNetworkRequest from helper import adjust_filename, TimedQApplication diff --git a/tests/QtXml/qdomdocument_test.py b/tests/QtXml/qdomdocument_test.py index 86aece7ba..052329c3d 100644 --- a/tests/QtXml/qdomdocument_test.py +++ b/tests/QtXml/qdomdocument_test.py @@ -1,7 +1,7 @@ #!/usr/bin/python import unittest -from PySide.QtCore import QByteArray -from PySide.QtXml import QDomDocument, QDomElement +from PySide2.QtCore import QByteArray +from PySide2.QtXml import QDomDocument, QDomElement class QDomDocumentTest(unittest.TestCase): @@ -9,14 +9,14 @@ class QDomDocumentTest(unittest.TestCase): self.dom = QDomDocument() self.goodXmlData = QByteArray(''' - <typesystem package="PySide.QtXml"> + <typesystem package="PySide2.QtXml"> <value-type name="QDomDocument"/> <value-type name="QDomElement"/> </typesystem> ''') self.badXmlData = QByteArray(''' - <typesystem package="PySide.QtXml"> + <typesystem package="PySide2.QtXml"> <value-type name="QDomDocument"> </typesystem> ''') @@ -54,7 +54,7 @@ class QDomDocumentTest(unittest.TestCase): ok, errorStr, errorLine, errorColumn = self.dom.setContent(self.goodXmlData, True) root = self.dom.documentElement() self.assertEqual(root.tagName(), 'typesystem') - checkAttribute(root, 'package', 'PySide.QtXml') + checkAttribute(root, 'package', 'PySide2.QtXml') child = root.firstChildElement('value-type') checkAttribute(child, 'name', 'QDomDocument') diff --git a/tests/QtXml/qxmlsimplereader_test.py b/tests/QtXml/qxmlsimplereader_test.py index aaaf45a48..0f5f1aaf4 100644 --- a/tests/QtXml/qxmlsimplereader_test.py +++ b/tests/QtXml/qxmlsimplereader_test.py @@ -1,6 +1,6 @@ #!/usr/bin/python import unittest -from PySide.QtXml import QXmlSimpleReader +from PySide2.QtXml import QXmlSimpleReader class QXmlSimpleReaderTest(unittest.TestCase): diff --git a/tests/QtXmlPatterns/import_test.py b/tests/QtXmlPatterns/import_test.py index 5bab9755c..f96c28af1 100644 --- a/tests/QtXmlPatterns/import_test.py +++ b/tests/QtXmlPatterns/import_test.py @@ -1,8 +1,8 @@ #!/usr/bin/python import unittest -from PySide.QtCore import * -from PySide.QtXmlPatterns import QXmlSchema +from PySide2.QtCore import * +from PySide2.QtXmlPatterns import QXmlSchema from helper import UsesQCoreApplication class QXmlPatternsTest(UsesQCoreApplication): diff --git a/tests/mac/qmacstyle_test.py b/tests/mac/qmacstyle_test.py index e23a6e55c..f04eb3f7e 100644 --- a/tests/mac/qmacstyle_test.py +++ b/tests/mac/qmacstyle_test.py @@ -1,6 +1,6 @@ -# Qt5: this is gone: from PySide.QtGui import QMacStyle -from PySide.QtWidgets import QApplication, QLabel, QStyleFactory -from PySide.QtCore import QObject +# Qt5: this is gone: from PySide2.QtGui import QMacStyle +from PySide2.QtWidgets import QApplication, QLabel, QStyleFactory +from PySide2.QtCore import QObject import unittest diff --git a/tests/manually/bug_841.py b/tests/manually/bug_841.py index 613867890..239911a91 100644 --- a/tests/manually/bug_841.py +++ b/tests/manually/bug_841.py @@ -2,8 +2,8 @@ from __future__ import print_function import sys
-from PySide.QtGui import QStandardItem, QStandardItemModel
-from PySide.QtWidgets import QMainWindow, QTreeView, QAbstractItemView, QApplication, QMessageBox
+from PySide2.QtGui import QStandardItem, QStandardItemModel
+from PySide2.QtWidgets import QMainWindow, QTreeView, QAbstractItemView, QApplication, QMessageBox
class Item(QStandardItem):
def __init__(self, text):
diff --git a/tests/pysidetest/application_test.py b/tests/pysidetest/application_test.py index 1cc937aa8..ea969677b 100644 --- a/tests/pysidetest/application_test.py +++ b/tests/pysidetest/application_test.py @@ -2,7 +2,7 @@ import unittest from testbinding import TestObject -from PySide.QtWidgets import QApplication +from PySide2.QtWidgets import QApplication class QApplicationInstance(unittest.TestCase): diff --git a/tests/pysidetest/decoratedslot_test.py b/tests/pysidetest/decoratedslot_test.py index 63a5be72a..d5ecb0827 100644 --- a/tests/pysidetest/decoratedslot_test.py +++ b/tests/pysidetest/decoratedslot_test.py @@ -1,7 +1,7 @@ #!/usr/bin/python import unittest -from PySide.QtCore import QObject +from PySide2.QtCore import QObject from testbinding import TestObject class Receiver(QObject): diff --git a/tests/pysidetest/delegatecreateseditor_test.py b/tests/pysidetest/delegatecreateseditor_test.py index 0b223500b..0ba3b2b4c 100644 --- a/tests/pysidetest/delegatecreateseditor_test.py +++ b/tests/pysidetest/delegatecreateseditor_test.py @@ -4,8 +4,8 @@ import unittest from helper import UsesQApplication from testbinding import TestView -from PySide.QtCore import Qt -from PySide.QtWidgets import QAbstractItemDelegate, QComboBox +from PySide2.QtCore import Qt +from PySide2.QtWidgets import QAbstractItemDelegate, QComboBox id_text = 'This is me' diff --git a/tests/pysidetest/list_signal_test.py b/tests/pysidetest/list_signal_test.py index 36d3c21d2..b55eb075c 100644 --- a/tests/pysidetest/list_signal_test.py +++ b/tests/pysidetest/list_signal_test.py @@ -2,7 +2,7 @@ import unittest from testbinding import TestObject -from PySide.QtCore import QObject +from PySide2.QtCore import QObject class ListConnectionTest(unittest.TestCase): diff --git a/tests/pysidetest/modelview_test.py b/tests/pysidetest/modelview_test.py index f1cd8bbb1..00bb94045 100644 --- a/tests/pysidetest/modelview_test.py +++ b/tests/pysidetest/modelview_test.py @@ -3,7 +3,7 @@ import unittest import py3kcompat as py3k from testbinding import TestView -from PySide.QtCore import QAbstractListModel, QObject, QModelIndex +from PySide2.QtCore import QAbstractListModel, QObject, QModelIndex '''Tests model/view relationship.''' diff --git a/tests/pysidetest/qvariant_test.py b/tests/pysidetest/qvariant_test.py index bc694dc68..63a1ebc9e 100644 --- a/tests/pysidetest/qvariant_test.py +++ b/tests/pysidetest/qvariant_test.py @@ -1,8 +1,8 @@ import unittest from testbinding import TestObject -from PySide.QtCore import Qt -from PySide.QtWidgets import QKeySequence +from PySide2.QtCore import Qt +from PySide2.QtWidgets import QKeySequence from helper import UsesQApplication diff --git a/tests/pysidetest/signalemissionfrompython_test.py b/tests/pysidetest/signalemissionfrompython_test.py index 9d130cb4a..6d948d8f2 100644 --- a/tests/pysidetest/signalemissionfrompython_test.py +++ b/tests/pysidetest/signalemissionfrompython_test.py @@ -2,7 +2,7 @@ import unittest from testbinding import TestObject -from PySide.QtCore import QObject, SIGNAL +from PySide2.QtCore import QObject, SIGNAL '''Tests the behaviour of signals with default values when emitted from Python.''' diff --git a/tests/pysidetest/signalwithdefaultvalue_test.py b/tests/pysidetest/signalwithdefaultvalue_test.py index 3a18bb715..ab84cc563 100644 --- a/tests/pysidetest/signalwithdefaultvalue_test.py +++ b/tests/pysidetest/signalwithdefaultvalue_test.py @@ -2,7 +2,7 @@ import unittest from testbinding import TestObject -from PySide.QtCore import QObject, SIGNAL +from PySide2.QtCore import QObject, SIGNAL '''Tests the behaviour of signals with default values.''' diff --git a/tests/pysidetest/typedef_signal_test.py b/tests/pysidetest/typedef_signal_test.py index c2cdd1216..b00a9972f 100644 --- a/tests/pysidetest/typedef_signal_test.py +++ b/tests/pysidetest/typedef_signal_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import QObject +from PySide2.QtCore import QObject from testbinding import TestObject class Receiver(QObject): diff --git a/tests/signals/args_dont_match_test.py b/tests/signals/args_dont_match_test.py index 25211671c..5a8ab45a8 100644 --- a/tests/signals/args_dont_match_test.py +++ b/tests/signals/args_dont_match_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class ArgsDontMatch(unittest.TestCase): diff --git a/tests/signals/bug_312.py b/tests/signals/bug_312.py index 3aa54cef3..af1dc5302 100644 --- a/tests/signals/bug_312.py +++ b/tests/signals/bug_312.py @@ -3,7 +3,7 @@ import unittest import sys -from PySide.QtCore import QObject, SIGNAL +from PySide2.QtCore import QObject, SIGNAL MAX_LOOPS = 5 MAX_OBJECTS = 200 diff --git a/tests/signals/decorators_test.py b/tests/signals/decorators_test.py index 8ca614ecb..e6cec6301 100644 --- a/tests/signals/decorators_test.py +++ b/tests/signals/decorators_test.py @@ -2,7 +2,7 @@ import unittest -from PySide.QtCore import QObject, Slot, SIGNAL, SLOT +from PySide2.QtCore import QObject, Slot, SIGNAL, SLOT class MyObject(QObject): def __init__(self, parent=None): diff --git a/tests/signals/disconnect_test.py b/tests/signals/disconnect_test.py index d2e7217ae..f452d0fc1 100644 --- a/tests/signals/disconnect_test.py +++ b/tests/signals/disconnect_test.py @@ -1,5 +1,5 @@ import unittest -from PySide.QtCore import * +from PySide2.QtCore import * from testbinding import TestObject diff --git a/tests/signals/invalid_callback_test.py b/tests/signals/invalid_callback_test.py index 3328bb5c6..3b7ba1ff6 100644 --- a/tests/signals/invalid_callback_test.py +++ b/tests/signals/invalid_callback_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import QObject, SIGNAL +from PySide2.QtCore import QObject, SIGNAL class InvalidCallback(unittest.TestCase): '''Test case for passing an invalid callback to QObject.connect''' diff --git a/tests/signals/lambda_gui_test.py b/tests/signals/lambda_gui_test.py index 291f469ed..9ae22a134 100644 --- a/tests/signals/lambda_gui_test.py +++ b/tests/signals/lambda_gui_test.py @@ -3,10 +3,10 @@ import unittest -from PySide.QtCore import QObject, SIGNAL +from PySide2.QtCore import QObject, SIGNAL try: - from PySide.QtWidgets import QSpinBox, QPushButton + from PySide2.QtWidgets import QSpinBox, QPushButton hasQtGui = True except ImportError: hasQtGui = False diff --git a/tests/signals/lambda_test.py b/tests/signals/lambda_test.py index dff743c84..6c602b463 100644 --- a/tests/signals/lambda_test.py +++ b/tests/signals/lambda_test.py @@ -5,7 +5,7 @@ import sys import unittest -from PySide.QtCore import QObject, SIGNAL, QProcess +from PySide2.QtCore import QObject, SIGNAL, QProcess from helper import UsesQCoreApplication diff --git a/tests/signals/multiple_connections_gui_test.py b/tests/signals/multiple_connections_gui_test.py index 275d3fac5..944d16013 100644 --- a/tests/signals/multiple_connections_gui_test.py +++ b/tests/signals/multiple_connections_gui_test.py @@ -2,10 +2,10 @@ import unittest import random from functools import partial -from PySide.QtCore import QObject, SIGNAL +from PySide2.QtCore import QObject, SIGNAL try: - from PySide.QtWidgets import QPushButton, QSpinBox + from PySide2.QtWidgets import QPushButton, QSpinBox hasQtGui = True except ImportError: hasQtGui = False diff --git a/tests/signals/multiple_connections_test.py b/tests/signals/multiple_connections_test.py index 57ea89871..29e9d6435 100644 --- a/tests/signals/multiple_connections_test.py +++ b/tests/signals/multiple_connections_test.py @@ -3,7 +3,7 @@ import sys import unittest from functools import partial -from PySide.QtCore import QObject, SIGNAL, QProcess +from PySide2.QtCore import QObject, SIGNAL, QProcess from helper import BasicPySlotCase, UsesQCoreApplication diff --git a/tests/signals/pysignal_test.py b/tests/signals/pysignal_test.py index 33fb383dd..86a4c0c3e 100644 --- a/tests/signals/pysignal_test.py +++ b/tests/signals/pysignal_test.py @@ -1,9 +1,9 @@ import unittest -from PySide.QtCore import QObject, SIGNAL, SLOT, Qt +from PySide2.QtCore import QObject, SIGNAL, SLOT, Qt try: - from PySide.QtWidgets import QSpinBox, QApplication, QWidget + from PySide2.QtWidgets import QSpinBox, QApplication, QWidget hasQtGui = True except ImportError: hasQtGui = False diff --git a/tests/signals/qobject_destroyed_test.py b/tests/signals/qobject_destroyed_test.py index 01d1b5886..61a8cee9c 100644 --- a/tests/signals/qobject_destroyed_test.py +++ b/tests/signals/qobject_destroyed_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import QObject, SIGNAL +from PySide2.QtCore import QObject, SIGNAL class QObjectDestroyed(unittest.TestCase): """Very simple test case for the destroyed() signal of QObject""" diff --git a/tests/signals/qobject_receivers_test.py b/tests/signals/qobject_receivers_test.py index 22ebb81c1..9881d2cdf 100644 --- a/tests/signals/qobject_receivers_test.py +++ b/tests/signals/qobject_receivers_test.py @@ -3,7 +3,7 @@ ''' Test case for QObject.receivers()''' import unittest -from PySide.QtCore import * +from PySide2.QtCore import * def cute_slot(): pass diff --git a/tests/signals/qobject_sender_test.py b/tests/signals/qobject_sender_test.py index 7ddeab6eb..84b2c76b9 100644 --- a/tests/signals/qobject_sender_test.py +++ b/tests/signals/qobject_sender_test.py @@ -3,7 +3,7 @@ '''Test cases for QObject.sender()''' import unittest -from PySide.QtCore import * +from PySide2.QtCore import * from helper import UsesQCoreApplication class ExtQTimer(QTimer): diff --git a/tests/signals/ref01_test.py b/tests/signals/ref01_test.py index ba6839ec3..61f08bf4b 100644 --- a/tests/signals/ref01_test.py +++ b/tests/signals/ref01_test.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtCore import QObject, Signal +from PySide2.QtCore import QObject, Signal class BoundAndUnboundSignalsTest(unittest.TestCase): diff --git a/tests/signals/ref02_test.py b/tests/signals/ref02_test.py index 4580f04a1..4a443c949 100644 --- a/tests/signals/ref02_test.py +++ b/tests/signals/ref02_test.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtCore import QCoreApplication, QTimeLine +from PySide2.QtCore import QCoreApplication, QTimeLine from helper import UsesQCoreApplication class NativeSignalsTest(UsesQCoreApplication): diff --git a/tests/signals/ref03_test.py b/tests/signals/ref03_test.py index f974d743b..672a31b3c 100644 --- a/tests/signals/ref03_test.py +++ b/tests/signals/ref03_test.py @@ -3,7 +3,7 @@ import unittest from sys import getrefcount -from PySide.QtCore import QObject +from PySide2.QtCore import QObject class DisconnectSignalsTest(unittest.TestCase): diff --git a/tests/signals/ref04_test.py b/tests/signals/ref04_test.py index 88a59f68a..e9b4b8008 100644 --- a/tests/signals/ref04_test.py +++ b/tests/signals/ref04_test.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtCore import QObject, Signal +from PySide2.QtCore import QObject, Signal class ExtQObject(QObject): diff --git a/tests/signals/ref05_test.py b/tests/signals/ref05_test.py index 90766aae7..1a660afca 100644 --- a/tests/signals/ref05_test.py +++ b/tests/signals/ref05_test.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtCore import QObject, QCoreApplication, QTimeLine, Slot +from PySide2.QtCore import QObject, QCoreApplication, QTimeLine, Slot from helper import UsesQCoreApplication class ExtQObject(QObject): diff --git a/tests/signals/ref06_test.py b/tests/signals/ref06_test.py index ef7098ddc..6a47f350e 100644 --- a/tests/signals/ref06_test.py +++ b/tests/signals/ref06_test.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtCore import QObject, QCoreApplication, QTimeLine, Signal, Slot +from PySide2.QtCore import QObject, QCoreApplication, QTimeLine, Signal, Slot from helper import UsesQCoreApplication class ExtQObject(QObject): diff --git a/tests/signals/segfault_proxyparent_test.py b/tests/signals/segfault_proxyparent_test.py index 791e19cb2..89bf104ba 100644 --- a/tests/signals/segfault_proxyparent_test.py +++ b/tests/signals/segfault_proxyparent_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import QObject, SIGNAL +from PySide2.QtCore import QObject, SIGNAL # Description of the problem # After creating an PyObject that inherits from QObject, connecting it, diff --git a/tests/signals/self_connect_test.py b/tests/signals/self_connect_test.py index 61e618da2..1a8538258 100644 --- a/tests/signals/self_connect_test.py +++ b/tests/signals/self_connect_test.py @@ -4,8 +4,8 @@ import unittest -from PySide.QtCore import QObject, SIGNAL, SLOT -from PySide.QtWidgets import QPushButton, QWidget +from PySide2.QtCore import QObject, SIGNAL, SLOT +from PySide2.QtWidgets import QPushButton, QWidget from helper import UsesQApplication diff --git a/tests/signals/short_circuit_test.py b/tests/signals/short_circuit_test.py index e36420cad..b7a5318e2 100644 --- a/tests/signals/short_circuit_test.py +++ b/tests/signals/short_circuit_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import QObject, SIGNAL, SLOT +from PySide2.QtCore import QObject, SIGNAL, SLOT class Dummy(QObject): """Dummy class used in this test.""" diff --git a/tests/signals/signal2signal_connect_test.py b/tests/signals/signal2signal_connect_test.py index bdc2328bf..2b9c0748f 100644 --- a/tests/signals/signal2signal_connect_test.py +++ b/tests/signals/signal2signal_connect_test.py @@ -3,7 +3,7 @@ ''' Test case for signal to signal connections.''' import unittest -from PySide.QtCore import * +from PySide2.QtCore import * def cute_slot(): pass diff --git a/tests/signals/signal_autoconnect_test.py b/tests/signals/signal_autoconnect_test.py index 9c2a005c3..abfce431d 100644 --- a/tests/signals/signal_autoconnect_test.py +++ b/tests/signals/signal_autoconnect_test.py @@ -2,8 +2,8 @@ import unittest -from PySide.QtCore import * -from PySide.QtWidgets import * +from PySide2.QtCore import * +from PySide2.QtWidgets import * class MyObject(QWidget): def __init__(self, parent=None): diff --git a/tests/signals/signal_connectiontype_support_test.py b/tests/signals/signal_connectiontype_support_test.py index d0c35c53a..b98c6e691 100644 --- a/tests/signals/signal_connectiontype_support_test.py +++ b/tests/signals/signal_connectiontype_support_test.py @@ -1,7 +1,7 @@ import unittest -from PySide.QtCore import QObject, SIGNAL, Qt +from PySide2.QtCore import QObject, SIGNAL, Qt class Dummy(QObject): """Dummy class used in this test.""" diff --git a/tests/signals/signal_emission_gui_test.py b/tests/signals/signal_emission_gui_test.py index 79964ebc2..a68128ebb 100644 --- a/tests/signals/signal_emission_gui_test.py +++ b/tests/signals/signal_emission_gui_test.py @@ -4,10 +4,10 @@ import unittest -from PySide.QtCore import QObject, SIGNAL, SLOT +from PySide2.QtCore import QObject, SIGNAL, SLOT try: - from PySide.QtWidgets import QSpinBox, QPushButton + from PySide2.QtWidgets import QSpinBox, QPushButton hasQtGui = True except ImportError: hasQtGui = False diff --git a/tests/signals/signal_emission_test.py b/tests/signals/signal_emission_test.py index 44bfd9021..e69ba9c04 100644 --- a/tests/signals/signal_emission_test.py +++ b/tests/signals/signal_emission_test.py @@ -6,7 +6,7 @@ import sys import unittest import functools -from PySide.QtCore import QObject, SIGNAL, SLOT, QProcess, QTimeLine +from PySide2.QtCore import QObject, SIGNAL, SLOT, QProcess, QTimeLine from helper import BasicPySlotCase, UsesQCoreApplication diff --git a/tests/signals/signal_func_test.py b/tests/signals/signal_func_test.py index 39bd1b293..ee4a4e70f 100644 --- a/tests/signals/signal_func_test.py +++ b/tests/signals/signal_func_test.py @@ -2,7 +2,7 @@ import unittest -from PySide.QtCore import SIGNAL, SLOT +from PySide2.QtCore import SIGNAL, SLOT class SIGNALSLOTTests(unittest.TestCase): '''Test the output of SIGNAL and SLOT.''' diff --git a/tests/signals/signal_manager_refcount_test.py b/tests/signals/signal_manager_refcount_test.py index 191ce9d63..9bddf6bf2 100644 --- a/tests/signals/signal_manager_refcount_test.py +++ b/tests/signals/signal_manager_refcount_test.py @@ -2,7 +2,7 @@ from sys import getrefcount import unittest -from PySide.QtCore import QObject, SIGNAL +from PySide2.QtCore import QObject, SIGNAL class SignalManagerRefCount(unittest.TestCase): """Simple test case to check if the signal_manager is erroneously incrementing the object refcounter""" diff --git a/tests/signals/signal_object_test.py b/tests/signals/signal_object_test.py index 5c4e06075..a6947e4e2 100644 --- a/tests/signals/signal_object_test.py +++ b/tests/signals/signal_object_test.py @@ -2,7 +2,7 @@ import unittest -from PySide.QtCore import QTimer, Signal, QObject, Slot, Qt +from PySide2.QtCore import QTimer, Signal, QObject, Slot, Qt from helper import UsesQCoreApplication class MyObject(QTimer): diff --git a/tests/signals/signal_signature_test.py b/tests/signals/signal_signature_test.py index 001f7d6af..58ba6771e 100644 --- a/tests/signals/signal_signature_test.py +++ b/tests/signals/signal_signature_test.py @@ -3,7 +3,7 @@ '''Test case for signal signature received by QObject::connectNotify().''' import unittest -from PySide.QtCore import * +from PySide2.QtCore import * from helper import UsesQCoreApplication class Obj(QObject): diff --git a/tests/signals/signal_with_primitive_type_test.py b/tests/signals/signal_with_primitive_type_test.py index 96ff353cc..15ffbcd0c 100644 --- a/tests/signals/signal_with_primitive_type_test.py +++ b/tests/signals/signal_with_primitive_type_test.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtCore import * +from PySide2.QtCore import * class SignalPrimitiveTypeTest(unittest.TestCase): diff --git a/tests/signals/slot_reference_count_test.py b/tests/signals/slot_reference_count_test.py index 62037f28c..fe8b7fce9 100644 --- a/tests/signals/slot_reference_count_test.py +++ b/tests/signals/slot_reference_count_test.py @@ -4,7 +4,7 @@ import unittest from sys import getrefcount -from PySide.QtCore import QObject, SIGNAL, SLOT +from PySide2.QtCore import QObject, SIGNAL, SLOT class Dummy(QObject): def dispatch(self): diff --git a/tests/signals/static_metaobject_test.py b/tests/signals/static_metaobject_test.py index 9d62bcdc2..c4e1fcaa7 100644 --- a/tests/signals/static_metaobject_test.py +++ b/tests/signals/static_metaobject_test.py @@ -4,7 +4,7 @@ import unittest -from PySide.QtCore import QObject, SIGNAL +from PySide2.QtCore import QObject, SIGNAL from helper import UsesQCoreApplication class MyObject(QObject): diff --git a/tests/util/helper/__init__.py b/tests/util/helper/__init__.py index 51283495c..2aba99b8b 100644 --- a/tests/util/helper/__init__.py +++ b/tests/util/helper/__init__.py @@ -9,7 +9,7 @@ from random import randint from PySide2.QtCore import QCoreApplication, QTimer try: - from PySide.QtWidgets import QApplication + from PySide2.QtWidgets import QApplication except ImportError: has_gui = False else: |