8000 switch to _vendor.qtpy · secondmover/winpython@545e169 · GitHub
[go: up one dir, main page]
Skip to content

Commit 545e169

Browse files
author
stonebig
committed
switch to _vendor.qtpy
1 parent 5bbb139 commit 545e169

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

‎winpython/controlpanel.py

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,19 @@
1616
import platform
1717
import locale
1818

19-
from winpython.qt.QtGui import (QApplication, QMainWindow, QWidget, QLineEdit,
20-
QHBoxLayout, QVBoxLayout, QColor, QMessageBox,
19+
# winpython.qt becomes winpython._vendor.qtpy
20+
from winpython._vendor.qtpy.QtWidgets import (QApplication, QMainWindow, QWidget, QLineEdit,
21+
QHBoxLayout, QVBoxLayout, QMessageBox,
2122
QAbstractItemView, QProgressDialog, QTableView,
22-
QPushButton, QLabel, QTabWidget, QToolTip,
23-
QDesktopServices)
24-
from winpython.qt.QtCore import (Qt, QAbstractTableModel, QModelIndex, Signal,
23+
QPushButton, QLabel, QTabWidget, QToolTip)
24+
25+
from winpython._vendor.qtpy.QtGui import (QColor, QDesktopServices)
26+
27+
from winpython._vendor.qtpy.QtCore import (Qt, QAbstractTableModel, QModelIndex, Signal,
2528
QThread, QTimer, QUrl)
26-
from winpython.qt.compat import (to_qvariant, getopenfilenames,
29+
from winpython._vendor.qtpy.compat import (to_qvariant, getopenfilenames,
2730
getexistingdirectory)
28-
import winpython.qt
31+
import winpython._vendor.qtpy
2932

3033
from winpython.qthelpers import (get_icon, add_actions, create_action,
3134
keybinding, get_std_icon, action2button,
@@ -722,8 +725,8 @@ def report_issue(self):
722725
Please provide any additional information below.
723726
""" % (python_distribution_infos(),
724727
__version__, platform.python_version(),
725-
winpython.qt.QtCore.__version__, winpython.qt.API_NAME,
726-
winpython.qt.__version__)
728+
winpython._vendor.qtpy.QtCore.__version__, winpython.qt.API_NAME,
729+
winpython._vendor.qtpy.__version__)
727730

728731
url = QUrl("%s/issues/entry" % __project_url__)
729732
url.addQueryItem("comment", issue_template)
@@ -742,11 +745,11 @@ def about(self):
742745
discussions, etc.</p>
743746
<p>This program is executed by:<br>
744747
<b>%s</b><br>
745-
Python %s, Qt %s, %s %s"""
748+
Python %s, Qt %s, %s qtpy %s"""
746749
% (self.NAME, __version__, __project_url__,
747750
python_distribution_infos(),
748-
platform.python_version(), winpython.qt.QtCore.__version__,
749-
winpython.qt.API_NAME, winpython.qt.__version__,))
751+
platform.python_version(), winpython._vendor.qtpy.QtCore.__version__,
752+
winpython._vendor.qtpy.API_NAME, winpython._vendor.qtpy.__version__,))
750753

751754

752755
def main(test=False):

‎winpython/qthelpers.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@
1010

1111
"""Qt utilities"""
1212

13-
from winpython.qt.QtGui import (QAction, QStyle, QWidget, QIcon, QApplication,
13+
# winpython.qt becomes winpython._vendor.qtpy
14+
from winpython._vendor.qtpy.QtWidgets import (QAction, QStyle, QWidget, QApplication,
1415
QLabel, QVBoxLayout, QHBoxLayout, QLineEdit,
15-
QKeyEvent, QMenu, QKeySequence, QToolButton,
16-
QPixmap)
17-
from winpython.qt.QtCore import (Signal, QObject, Qt, QLocale, QTranslator,
16+
QMenu, QToolButton)
17+
18+
from winpython._vendor.qtpy.QtGui import (QIcon, QKeyEvent, QKeySequence, QPixmap)
19+
20+
from winpython._vendor.qtpy.QtCore import (Signal, QObject, Qt, QLocale, QTranslator,
1821
QLibraryInfo, QEvent, Slot)
19-
from winpython.qt.compat import to_qvariant, from_qvariant
22+
from winpython._vendor.qtpy.compat import to_qvariant, from_qvariant
2023

2124
import os
2225
import re

0 commit comments

Comments
 (0)
0