* chg: try to import QtCore and QtWidget by using qtpy when Qt.py mod…

examples/declarative-form.py

@@ -1,7 +1,13 @@
 import json
 import os.path
+try:
+    from Qt import QtWidgets
+	from Qt import QtCore
+except ImportError:
+    from qtpy import QtWidgets
+	from qtpy import QtCore
+
 from datetime import datetime
-from Qt import QtWidgets, QtCore
 from guibedos import css
 from guibedos import declarative_form as df
 

examples/tag-bar.py

@@ -1,4 +1,8 @@
-from Qt import QtWidgets
+try:
+    from Qt import QtWidgets
+except ImportError:
+    from qtpy import QtWidgets
+
 from guibedos import css
 from guibedos.widgets import TagBar
 

guibedos/blender27.py

@@ -7,8 +7,14 @@
 See `tube_scenemanager`, `character_picker` and `resource_library` for examples
 """
 import atexit
-from Qt import QtCore
-from Qt import QtWidgets
+
+try:
+    from Qt import QtWidgets
+    from Qt import QtCore
+except ImportError:
+    from qtpy import QtWidgets
+    from qtpy import QtCore
+
 from . import css
 import bpy
 from bpy.app.handlers import persistent

guibedos/declarative_form/form.py

@@ -1,4 +1,7 @@
-from Qt import QtWidgets
+try:
+    from Qt import QtWidgets
+except ImportError:
+    from qtpy import QtWidgets
 from . import maker, handler
 from guibedos.helpers import clear_layout
 

guibedos/declarative_form/groupbox.py

@@ -1,4 +1,7 @@
-from Qt import QtWidgets
+try:
+    from Qt import QtWidgets
+except ImportError:
+    from qtpy import QtWidgets
 from guibedos.widgets import FlowLayout
 # TODO : this is not part of the widgets packages because maker cannot be imported from there -> "find a better way"
 try:

guibedos/declarative_form/maker.py

@@ -1,4 +1,7 @@
-from Qt import QtWidgets
+try:
+    from Qt import QtWidgets
+except ImportError:
+    from qtpy import QtWidgets
 from .widgets import *
 from .properties import *
 from .groupbox import GroupBox

guibedos/declarative_form/widgets/checkbox.py

@@ -1,4 +1,7 @@
-from Qt import QtWidgets
+try:
+    from Qt import QtWidgets
+except ImportError:
+    from qtpy import QtWidgets
 
 
 class CheckBox(QtWidgets.QCheckBox):

guibedos/declarative_form/widgets/combobox.py

@@ -1,5 +1,7 @@
-from Qt import QtWidgets
-
+try:
+    from Qt import QtWidgets
+except ImportError:
+    from qtpy import QtWidgets
 
 class ComboBox(QtWidgets.QComboBox):
 

guibedos/declarative_form/widgets/filepath_widget.py

@@ -1,5 +1,8 @@
 import os
-from Qt import QtWidgets
+try:
+    from Qt import QtWidgets
+except ImportError:
+    from qtpy import QtWidgets
 
 
 class FileDialog(QtWidgets.QFileDialog):

guibedos/declarative_form/widgets/label_widget.py

@@ -1,5 +1,7 @@
-from Qt import QtWidgets
-
+try:
+    from Qt import QtWidgets
+except ImportError:
+    from qtpy import QtWidgets
 
 class LabelWidget(QtWidgets.QLabel):
 

guibedos/declarative_form/widgets/lineedit.py

@@ -1,5 +1,7 @@
-from Qt import QtWidgets
-
+try:
+    from Qt import QtWidgets
+except ImportError:
+    from qtpy import QtWidgets
 
 class LineEdit(QtWidgets.QLineEdit):
 

guibedos/declarative_form/widgets/spinbox.py

@@ -1,5 +1,7 @@
-from Qt import QtWidgets
-
+try:
+    from Qt import QtWidgets
+except ImportError:
+    from qtpy import QtWidgets
 _MAX = 2147483647
 
 

guibedos/helpers.py

@@ -1,5 +1,10 @@
-from Qt import QtCore
-from Qt import QtWidgets
+
+try:
+    from Qt import QtWidgets
+    from Qt import QtCore
+except ImportError:
+    from qtpy import QtWidgets
+    from qtpy import QtCore
 
 
 class Hourglass:

guibedos/widgets/flow_layout.py

@@ -7,8 +7,13 @@
 
 This file is licensed under GPLv2
 """
-from Qt import QtCore
-from Qt import QtWidgets
+
+try:
+    from Qt import QtWidgets
+    from Qt import QtCore
+except ImportError:
+    from qtpy import QtWidgets
+    from qtpy import QtCore
 
 
 class FlowLayout(QtWidgets.QLayout):

guibedos/widgets/tag_bar.py

@@ -2,8 +2,14 @@
 Button based LineEdit, for tag edition
 """
 import re
-from Qt import QtCore
-from Qt import QtWidgets
+
+try:
+    from Qt import QtWidgets
+    from Qt import QtCore
+except ImportError:
+    from qtpy import QtWidgets
+    from qtpy import QtCore
+
 from ..css import parse_images
 from .flow_layout import FlowLayout