Skip to content

qtpy-2.0.0dev0-20211030 merge #1028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 2 commits into from
Oct 30, 2021
Merged

qtpy-2.0.0dev0-20211030 merge #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd5f5bd
update version date
stonebig Oct 17, 2021
c84ae07
vendoring Qtpy-2.0.0dev0-20121030
stonebig Oct 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion winpython/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
OTHER DEALINGS IN THE SOFTWARE.
"""

__version__ = '4.6.20211010'
__version__ = '4.6.20211017'
__license__ = __doc__
__project_url__ = 'http://winpython.github.io/'
15 changes: 5 additions & 10 deletions winpython/_vendor/qtpy/Qt3DAnimation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# -----------------------------------------------------------------------------
# Copyright © 2009- The Spyder Development Team
#
Expand All @@ -9,18 +8,14 @@

# Local imports
from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION
from .py3compat import PY2

if PYQT5:
from PyQt5.Qt3DAnimation import *
elif PYSIDE2:
if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'):
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DAnimation as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DAnimation):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('A bug in Shiboken prevents this')
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DAnimation as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DAnimation):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('No Qt bindings could be found')
21 changes: 10 additions & 11 deletions winpython/_vendor/qtpy/Qt3DCore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# -----------------------------------------------------------------------------
# Copyright © 2009- The Spyder Development Team
#
Expand All @@ -8,19 +7,19 @@
"""Provides Qt3DCore classes and functions."""

# Local imports
from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION
from .py3compat import PY2
from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError

if PYQT5:
from PyQt5.Qt3DCore import *
elif PYQT6:
from PyQt6.Qt3DCore import *
elif PYSIDE6:
from PySide6.Qt3DCore.Qt3DCore import *
elif PYSIDE2:
if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'):
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DCore as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DCore):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('A bug in Shiboken prevents this')
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DCore as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DCore):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('No Qt bindings could be found')
21 changes: 10 additions & 11 deletions winpython/_vendor/qtpy/Qt3DExtras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# -----------------------------------------------------------------------------
# Copyright © 2009- The Spyder Development Team
#
Expand All @@ -8,19 +7,19 @@
"""Provides Qt3DExtras classes and functions."""

# Local imports
from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION
from .py3compat import PY2
from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError

if PYQT5:
from PyQt5.Qt3DExtras import *
elif PYQT6:
from PyQt6.Qt3DExtras import *
elif PYSIDE6:
from PySide6.Qt3DExtras.Qt3DExtras import *
elif PYSIDE2:
if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'):
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DExtras as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DExtras):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('A bug in Shiboken prevents this')
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DExtras as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DExtras):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('No Qt bindings could be found')
21 changes: 10 additions & 11 deletions winpython/_vendor/qtpy/Qt3DInput.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# -----------------------------------------------------------------------------
# Copyright © 2009- The Spyder Development Team
#
Expand All @@ -8,19 +7,19 @@
"""Provides Qt3DInput classes and functions."""

# Local imports
from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION
from .py3compat import PY2
from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError

if PYQT5:
from PyQt5.Qt3DInput import *
elif PYQT6:
from PyQt6.Qt3DInput import *
elif PYSIDE6:
from PySide6.Qt3DInput.Qt3DInput import *
elif PYSIDE2:
if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'):
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DInput as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DInput):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('A bug in Shiboken prevents this')
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DInput as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DInput):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('No Qt bindings could be found')
21 changes: 10 additions & 11 deletions winpython/_vendor/qtpy/Qt3DLogic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# -----------------------------------------------------------------------------
# Copyright © 2009- The Spyder Development Team
#
Expand All @@ -8,19 +7,19 @@
"""Provides Qt3DLogic classes and functions."""

# Local imports
from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION
from .py3compat import PY2
from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError

if PYQT5:
from PyQt5.Qt3DLogic import *
elif PYQT6:
from PyQt6.Qt3DLogic import *
elif PYSIDE6:
from PySide6.Qt3DLogic.Qt3DLogic import *
elif PYSIDE2:
if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'):
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DLogic as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DLogic):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('A bug in Shiboken prevents this')
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DLogic as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DLogic):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('No Qt bindings could be found')
21 changes: 10 additions & 11 deletions winpython/_vendor/qtpy/Qt3DRender.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# -----------------------------------------------------------------------------
# Copyright © 2009- The Spyder Development Team
#
Expand All @@ -8,19 +7,19 @@
"""Provides Qt3DRender classes and functions."""

# Local imports
from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION
from .py3compat import PY2
from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError

if PYQT5:
from PyQt5.Qt3DRender import *
elif PYSIDE6:
from PySide6.Qt3DRender.Qt3DRender import *
elif PYQT6:
from PyQt6.Qt3DRender import *
elif PYSIDE2:
if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'):
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DRender as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DRender):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('A bug in Shiboken prevents this')
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.Qt3DRender as __temp
import inspect
for __name in inspect.getmembers(__temp.Qt3DRender):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('No Qt bindings could be found')
19 changes: 15 additions & 4 deletions winpython/_vendor/qtpy/QtCharts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# -----------------------------------------------------------------------------
# Copyright © 2019- The Spyder Development Team
#
Expand All @@ -8,15 +7,27 @@
"""Provides QtChart classes and functions."""

# Local imports
from . import PYQT5, PYSIDE2, PythonQtError
from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError

if PYQT5:
try:
from PyQt5 import QtChart as QtCharts
from PyQt5.QtChart import *
except ImportError:
raise PythonQtError('The QtChart module was not found. '
'It needs to be installed separately for PyQt5.')
elif PYQT6:
try:
from PyQt6.QtCharts import *
except ImportError:
raise PythonQtError('The QtCharts module was not found. '
'It needs to be installed separately for PyQt6.')
elif PYSIDE6:
from PySide6.QtCharts import *
elif PYSIDE2:
from PySide2.QtCharts import *
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
import PySide2.QtCharts as __temp
import inspect
for __name in inspect.getmembers(__temp.QtCharts):
globals()[__name[0]] = __name[1]
else:
raise PythonQtError('No Qt bindings could be found')
92 changes: 16 additions & 76 deletions winpython/_vendor/qtpy/QtCore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
#
# Copyright © 2014-2015 Colin Duquesnoy
# Copyright © 2009- The Spyder Development Team
Expand All @@ -10,10 +9,18 @@
Provides QtCore classes and functions.
"""

from . import PYQT5, PYSIDE2, PYSIDE6, PYQT4, PYSIDE, PythonQtError
from . import PYQT6, PYQT5, PYSIDE2, PYSIDE6, PythonQtError

if PYQT6:
from PyQt6.QtCore import *
from PyQt6.QtCore import pyqtSignal as Signal
from PyQt6.QtCore import QT_VERSION_STR as __version__

if PYQT5:
QCoreApplication.exec_ = QCoreApplication.exec
QEventLoop.exec_ = QEventLoop.exec
QThread.exec_ = QThread.exec

elif PYQT5:
from PyQt5.QtCore import *
from PyQt5.QtCore import pyqtSignal as Signal
from PyQt5.QtCore import pyqtBoundSignal as SignalInstance
Expand All @@ -32,9 +39,12 @@
from PySide6.QtCore import *
import PySide6.QtCore
__version__ = PySide6.QtCore.__version__
Qt.BackgroundColorRole=Qt.BackgroundRole # suggested addition stonebig
Qt.TextColorRole=Qt.ForegroundRole # suggested addition stonebig
Qt.MidButton = Qt.MiddleButton # suggested addition stonebig

# obsolete in qt6
Qt.BackgroundColorRole = Qt.BackgroundRole
Qt.TextColorRole = Qt.ForegroundRole
Qt.MidButton = Qt.MiddleButton

elif PYSIDE2:
from PySide2.QtCore import *

Expand All @@ -45,75 +55,5 @@

import PySide2.QtCore
__version__ = PySide2.QtCore.__version__
elif PYQT4:
from PyQt4.QtCore import *
# Those are things we inherited from Spyder that fix crazy crashes under
# some specific situations. (See #34)
from PyQt4.QtCore import QCoreApplication
from PyQt4.QtCore import Qt
from PyQt4.QtCore import pyqtSignal as Signal
from PyQt4.Qtcore import pyqtBoundSignal as SignalInstance
from PyQt4.QtCore import pyqtSlot as Slot
from PyQt4.QtCore import pyqtProperty as Property
from PyQt4.QtGui import (QItemSelection, QItemSelectionModel,
QItemSelectionRange, QSortFilterProxyModel,
QStringListModel)
from PyQt4.QtCore import QT_VERSION_STR as __version__
from PyQt4.QtCore import qInstallMsgHandler as qInstallMessageHandler

# QDesktopServices has has been split into (QDesktopServices and
# QStandardPaths) in Qt5
# This creates a dummy class that emulates QStandardPaths
from PyQt4.QtGui import QDesktopServices as _QDesktopServices

class QStandardPaths():
StandardLocation = _QDesktopServices.StandardLocation
displayName = _QDesktopServices.displayName
DesktopLocation = _QDesktopServices.DesktopLocation
DocumentsLocation = _QDesktopServices.DocumentsLocation
FontsLocation = _QDesktopServices.FontsLocation
ApplicationsLocation = _QDesktopServices.ApplicationsLocation
MusicLocation = _QDesktopServices.MusicLocation
MoviesLocation = _QDesktopServices.MoviesLocation
PicturesLocation = _QDesktopServices.PicturesLocation
TempLocation = _QDesktopServices.TempLocation
HomeLocation = _QDesktopServices.HomeLocation
DataLocation = _QDesktopServices.DataLocation
CacheLocation = _QDesktopServices.CacheLocation
writableLocation = _QDesktopServices.storageLocation

# Those are imported from `import *`
del pyqtSignal, pyqtBoundSignal, pyqtSlot, pyqtProperty, QT_VERSION_STR, qInstallMsgHandler
elif PYSIDE:
from PySide.QtCore import *
from PySide.QtGui import (QItemSelection, QItemSelectionModel,
QItemSelectionRange, QSortFilterProxyModel,
QStringListModel)
from PySide.QtCore import qInstallMsgHandler as qInstallMessageHandler
del qInstallMsgHandler

# QDesktopServices has has been split into (QDesktopServices and
# QStandardPaths) in Qt5
# This creates a dummy class that emulates QStandardPaths
from PySide.QtGui import QDesktopServices as _QDesktopServices

class QStandardPaths():
StandardLocation = _QDesktopServices.StandardLocation
displayName = _QDesktopServices.displayName
DesktopLocation = _QDesktopServices.DesktopLocation
DocumentsLocation = _QDesktopServices.DocumentsLocation
FontsLocation = _QDesktopServices.FontsLocation
ApplicationsLocation = _QDesktopServices.ApplicationsLocation
MusicLocation = _QDesktopServices.MusicLocation
MoviesLocation = _QDesktopServices.MoviesLocation
PicturesLocation = _QDesktopServices.PicturesLocation
TempLocation = _QDesktopServices.TempLocation
HomeLocation = _QDesktopServices.HomeLocation
DataLocation = _QDesktopServices.DataLocation
CacheLocation = _QDesktopServices.CacheLocation
writableLocation = _QDesktopServices.storageLocation

import PySide.QtCore
__version__ = PySide.QtCore.__version__
else:
raise PythonQtError('No Qt bindings could be found')
19 changes: 19 additions & 0 deletions winpython/_vendor/qtpy/QtDBus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -----------------------------------------------------------------------------
# Copyright © 2009- The Spyder Development Team
#
# Licensed under the terms of the MIT License
# (see LICENSE.txt for details)
# -----------------------------------------------------------------------------
"""Provides QtDBus classes and functions."""

# Local imports
from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError

if PYQT5:
from PyQt5.QtDBus import *
elif PYQT6:
from PyQt6.QtDBus import *
elif PYSIDE6:
from PySide6.QtDBus import *
else:
raise PythonQtError('No Qt bindings could be found')
Loading