10000 Merge pull request #1199 from stonebig/master · Tmusvit/winpython@fe06b28 · GitHub
[go: up one dir, main page]
Skip to content

Commit fe06b28

Browse files
stonebigstonebig
authored
Merge pull request winpython#1199 from stonebig/master
end of py3compat
2 parents 373f9df + 1ee160f commit fe06b28

File tree

134 files changed

+3506
-812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+3506
-812
lines changed

‎winpython/_vendor/qtpy/_version.py

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎winpython/_vendor/qtpy/py3compat.py

Lines changed: 0 additions & 261 deletions
This file was deleted.

‎winpython/_vendor/qtpy/tests/Qsci.py

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# -----------------------------------------------------------------------------
2+
# Copyright © 2009- The Spyder Development Team
3+
#
4+
# Licensed under the terms of the MIT License
5+
# (see LICENSE.txt for details)
6+
# -----------------------------------------------------------------------------
7+
8+
"""Provides Qsci classes and functions."""
9+
10+
from . import (
11+
PYQT5,
12+
PYQT6,
13+
PYSIDE2,
14+
PYSIDE6,
15+
QtBindingMissingModuleError,
16+
QtModuleNotInstalledError
17+
)
18+
19+
if PYQT5:
20+
try:
21+
from PyQt5.Qsci import *
22+
except ModuleNotFoundError as error:
23+
raise QtModuleNotInstalledError(
24+
name='Qsci', missing_package='QScintilla'
25+
) from error
26+
elif PYQT6:
27+
try:
28+
from PyQt6.Qsci import *
29+
except ModuleNotFoundError as error:
30+
raise QtModuleNotInstalledError(
31+
name='Qsci', missing_package='PyQt6-QScintilla'
32+
) from error
33+
elif PYSIDE2:
34+
raise QtBindingMissingModuleError(name='Qsci')
35+
elif PYSIDE6:
36+
raise QtBindingMissingModuleError(name='Qsci')

‎winpython/_vendor/qtpy/tests/Qt3DAnimation.py

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# -----------------------------------------------------------------------------
2+
# Copyright © 2009- The Spyder Development Team
3+
#
4+
# Licensed under the terms of the MIT License
5+
# (see LICENSE.txt for details)
6+
# -----------------------------------------------------------------------------
7+
8+
"""Provides Qt3DAnimation classes and functions."""
9+
10+
from . import (
11+
PYQT5,
12+
PYQT6,
13+
PYSIDE2,
14+
PYSIDE6,
15+
QtModuleNotInstalledError,
16+
)
17+
18+
if PYQT5:
19+
try:
20+
from PyQt5.Qt3DAnimation import *
21+
except ModuleNotFoundError as error:
22+
raise QtModuleNotInstalledError(
23+
name='Qt3DAnimation', missing_package='PyQt3D'
24+
) from error
25+
elif PYQT6:
26+
try:
27+
from PyQt6.Qt3DAnimation import *
28+
except ModuleNotFoundError as error:
29+
raise QtModuleNotInstalledError(
30+
name='Qt3DAnimation', missing_package='PyQt6-3D'
31+
) from error
32+
elif PYSIDE2:
33+
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
34+
import PySide2.Qt3DAnimation as __temp
35+
import inspect
36+
37+
for __name in inspect.getmembers(__temp.Qt3DAnimation):
38+
globals()[__name[0]] = __name[1]
39+
elif PYSIDE6:
40+
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
41+
import PySide6.Qt3DAnimation as __temp
42+
import inspect
43+
44+
for __name in inspect.getmembers(__temp.Qt3DAnimation):
45+
globals()[__name[0]] = __name[1]

‎winpython/_vendor/qtpy/tests/Qt3DCore.py

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# -----------------------------------------------------------------------------
2+
# Copyright © 2009- The Spyder Development Team
3+
#
4+
# Licensed under the terms of the MIT License
5+
# (see LICENSE.txt for details)
6+
# -----------------------------------------------------------------------------
7+
8+
"""Provides Qt3DCore classes and functions."""
9+
10+
from . import (
11+
PYQT5,
12+
PYQT6,
13+
PYSIDE2,
14+
PYSIDE6,
15+
QtModuleNotInstalledError,
16+
)
17+
18+
if PYQT5:
19+
try:
20+
from PyQt5.Qt3DCore import *
21+
except ModuleNotFoundError as error:
22+
raise QtModuleNotInstalledError(
23+
name='Qt3DCore', missing_package='PyQt3D'
24+
) from error
25+
elif PYQT6:
26+
try:
27+
from PyQt6.Qt3DCore import *
28+
except ModuleNotFoundError as error:
29+
raise QtModuleNotInstalledError(
30+
name='Qt3DCore', missing_package='PyQt6-3D'
31+
) from error
32+
elif PYSIDE2:
33+
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
34+
import PySide2.Qt3DCore as __temp
35+
import inspect
36+
37+
for __name in inspect.getmembers(__temp.Qt3DCore):
38+
globals()[__name[0]] = __name[1]
39+
elif PYSIDE6:
40+
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
41+
import PySide6.Qt3DCore as __temp
42+
import inspect
43+
44+
for __name in inspect.getmembers(__temp.Qt3DCore):
45+
globals()[__name[0]] = __name[1]

0 commit comments

Comments
 (0)
2A5B
0