From 639a7493dca3f11188e17f7d2b63924218c493da Mon Sep 17 00:00:00 2001 From: En Yi Date: Tue, 10 Jul 2018 12:20:14 +0800 Subject: [PATCH] PEP 8 cleanup --- graphic_components/board.py | 6 ++++-- graphic_components/buttons.py | 2 +- graphic_components/menu_graphics.py | 3 ++- graphic_components/sudoku_graphics.py | 3 ++- main.py | 7 +++---- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/graphic_components/board.py b/graphic_components/board.py index d783c92..9327849 100644 --- a/graphic_components/board.py +++ b/graphic_components/board.py @@ -5,10 +5,11 @@ from PyQt5.QtWidgets import (QSizePolicy, QGraphicsWidget, QGraphicsItem, from PyQt5.QtCore import (QAbstractAnimation, QObject, QPointF, Qt, QRectF, QLineF, QPropertyAnimation, pyqtProperty, pyqtSignal, QSizeF) -from graphic_components import sudoku_graphics as sdk_grap -from graphic_components import menu_graphics as menu_grap +from . import sudoku_graphics as sdk_grap +from . import menu_graphics as menu_grap from general import extras + class BoxBoard(QGraphicsWidget): # Initialisation @@ -88,6 +89,7 @@ class GameBoard(BoxBoard): self.gamegrid.freeze = False self.gamegrid.setFocus() + class MenuBoard(BoxBoard): # TODO: Create the components for the menu: A timer and a difficulty selector def __init__(self, width, height, parent=None): diff --git a/graphic_components/buttons.py b/graphic_components/buttons.py index 23a89fb..f862bce 100644 --- a/graphic_components/buttons.py +++ b/graphic_components/buttons.py @@ -3,7 +3,7 @@ from PyQt5.Qt import QApplication, QTimer from PyQt5.QtWidgets import (QGraphicsScene, QGraphicsView, QGraphicsItem, QGraphicsLineItem, QGraphicsRectItem, QGraphicsObject, QGraphicsItemGroup, QGraphicsPathItem) -from PyQt5.QtCore import (QAbstractAnimation, QObject, QPointF, Qt, QRectF,QLineF, +from PyQt5.QtCore import (QAbstractAnimation, QObject, QPointF, Qt, QRectF, QLineF, QPropertyAnimation, pyqtProperty, pyqtSignal) import sys, math diff --git a/graphic_components/menu_graphics.py b/graphic_components/menu_graphics.py index 14a54b0..b00cdd7 100644 --- a/graphic_components/menu_graphics.py +++ b/graphic_components/menu_graphics.py @@ -5,7 +5,8 @@ from PyQt5.QtWidgets import (QSizePolicy, QGraphicsWidget, QGraphicsItem, from PyQt5.QtCore import (QAbstractAnimation, QObject, QPointF, Qt, QRectF, QLineF, QPropertyAnimation, pyqtProperty, pyqtSignal, QSizeF) -from graphic_components import buttons +from . import buttons + class TimerDisplayer(QGraphicsWidget): diff --git a/graphic_components/sudoku_graphics.py b/graphic_components/sudoku_graphics.py index a874608..3df9077 100644 --- a/graphic_components/sudoku_graphics.py +++ b/graphic_components/sudoku_graphics.py @@ -6,7 +6,8 @@ from PyQt5.QtCore import (QAbstractAnimation, QPointF, Qt, QRectF, QLineF, from gameplay import sudoku_gameplay as sdk from general.extras import bound_value -from graphic_components import buttons +from . import buttons + import numpy as np diff --git a/main.py b/main.py index 526cad8..b974be6 100644 --- a/main.py +++ b/main.py @@ -5,9 +5,9 @@ from PyQt5.QtWidgets import (QGraphicsScene, QGraphicsView, QGraphicsItem, QGraphicsItemGroup, QGraphicsWidget, QGraphicsLinearLayout) from PyQt5.QtCore import (QAbstractAnimation, QObject, QPoint, QPointF, Qt, QRectF,QLineF, QPropertyAnimation, pyqtProperty, pyqtSignal) -import sys, math +import sys -from graphic_components import buttons, board +from graphic_components import board class SudokuWindow(QGraphicsView): @@ -51,10 +51,9 @@ class SudokuWindow(QGraphicsView): self.gameboard.freeze_gameboard(freeze) - if __name__ == "__main__": app = 0 app = QApplication(sys.argv) ex = SudokuWindow() - sys.exit(app.exec_()) \ No newline at end of file + sys.exit(app.exec_())