From 2b2600812a37d58be93d38f58acaf58ad26b2f25 Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Tue, 21 Aug 2018 16:23:47 +0200
Subject: [PATCH] Use qtpy

---
 Tetris2000.py       |  2 +-
 source/consts.py    |  2 +-
 source/game_gui.py  |  2 +-
 source/point.py     |  3 ++-
 source/qt5.py       | 29 -----------------------------
 source/tetromino.py |  2 +-
 6 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 source/qt5.py

diff --git a/Tetris2000.py b/Tetris2000.py
index b5c26dc..87f240b 100644
--- a/Tetris2000.py
+++ b/Tetris2000.py
@@ -10,8 +10,8 @@ Parts of comments issued from 2009 Tetris Design Guideline
 
 
 import sys
+from qtpy import QtWidgets
 
-from source.qt5 import QtWidgets
 from source.game_gui import Window
 
 
diff --git a/source/consts.py b/source/consts.py
index be4eaca..b0a86ca 100644
--- a/source/consts.py
+++ b/source/consts.py
@@ -3,7 +3,7 @@
 
 
 import os
-from .qt5 import QtGui
+from qtpy import QtGui
 
 
 # Paths
diff --git a/source/game_gui.py b/source/game_gui.py
index 5bb049f..4e1b6dc 100644
--- a/source/game_gui.py
+++ b/source/game_gui.py
@@ -7,10 +7,10 @@ import itertools
 import locale
 import os
 import time
+from qtpy import QtWidgets, QtCore, QtGui, QtMultimedia
 
 from . import consts
 from .consts import L, R, CLOCKWISE, COUNTERCLOCKWISE
-from .qt5 import QtWidgets, QtCore, QtGui, QtMultimedia
 from .__version__ import __title__, __author__, __version__
 from .point import Point
 from .tetromino import Block, Tetromino, GhostPiece
diff --git a/source/point.py b/source/point.py
index 200ae12..f74ec33 100644
--- a/source/point.py
+++ b/source/point.py
@@ -2,8 +2,9 @@
 # -*- coding: utf-8 -*-
 
 
+from qtpy import QtCore
+
 from .consts import CLOCKWISE
-from .qt5 import QtCore
 
 
 class Point(QtCore.QPoint):
diff --git a/source/qt5.py b/source/qt5.py
deleted file mode 100644
index 5343e03..0000000
--- a/source/qt5.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-import sys
-import os
-
-try:
-    from PyQt5 import QtWidgets, QtCore, QtGui, QtMultimedia
-except ImportError as pyqt5_error:
-    try:
-        from PySide2 import QtWidgets, QtCore, QtGui, QtMultimedia
-    except ImportError as pyside2_error:
-        sys.exit(
-            "This program require a Qt5 library.\n"
-            "You can install PyQt5 (recommended) :\n"
-            "    pip3 install --user PyQt5\n"
-            "    pip3 install --user qdarkstyle\n"
-            "or PySide2 :\n"
-            "    pip3 install --user PySide2\n"
-            + pyqt5_error.msg
-            + "\n"
-            + pyside2_error.msg
-        )
-    else:
-        os.environ["QT_API"] = "pyside2"
-else:
-    os.environ["QT_API"] = "pyqt5"
-    QtCore.Signal = QtCore.pyqtSignal
-    
\ No newline at end of file
diff --git a/source/tetromino.py b/source/tetromino.py
index 72c20c5..cc3759f 100644
--- a/source/tetromino.py
+++ b/source/tetromino.py
@@ -3,11 +3,11 @@
 
 
 import random
+from qtpy import QtCore, QtGui
 
 from . import consts
 from .consts import L, R, U, D, CLOCKWISE, COUNTERCLOCKWISE
 from .point import Point
-from .qt5 import QtCore, QtGui
 
 
 class Block: