diff --git a/gui/sudoku.py b/gui/sudoku.py index 02370b77..420ad253 100644 --- a/gui/sudoku.py +++ b/gui/sudoku.py @@ -1,6 +1,6 @@ import argparse -from Tkinter import Tk, Canvas, Frame, Button, BOTH, TOP, BOTTOM +from tkinter import Tk, Canvas, Frame, Button, BOTH, TOP, BOTTOM BOARDS = ['debug', 'n00b', 'l33t', 'error'] # Available sudoku boards MARGIN = 20 # Pixels around the board @@ -68,7 +68,7 @@ def __draw_grid(self): """ Draws grid divided with blue lines into 3x3 squares """ - for i in xrange(10): + for i in range(10): color = "blue" if i % 3 == 0 else "gray" x0 = MARGIN + i * SIDE @@ -85,8 +85,8 @@ def __draw_grid(self): def __draw_puzzle(self): self.canvas.delete("numbers") - for i in xrange(9): - for j in xrange(9): + for i in range(9): + for j in range(9): answer = self.game.puzzle[i][j] if answer != 0: x = MARGIN + j * SIDE + SIDE / 2 @@ -203,20 +203,20 @@ def __init__(self, board_file): def start(self): self.game_over = False self.puzzle = [] - for i in xrange(9): + for i in range(9): self.puzzle.append([]) - for j in xrange(9): + for j in range(9): self.puzzle[i].append(self.start_puzzle[i][j]) def check_win(self): - for row in xrange(9): + for row in range(9): if not self.__check_row(row): return False - for column in xrange(9): + for column in range(9): if not self.__check_column(column): return False - for row in xrange(3): - for column in xrange(3): + for row in range(3): + for column in range(3): if not self.__check_square(row, column): return False self.game_over = True @@ -230,15 +230,15 @@ def __check_row(self, row): def __check_column(self, column): return self.__check_block( - [self.puzzle[row][column] for row in xrange(9)] + [self.puzzle[row][column] for row in range(9)] ) def __check_square(self, row, column): return self.__check_block( [ self.puzzle[r][c] - for r in xrange(row * 3, (row + 1) * 3) - for c in xrange(column * 3, (column + 1) * 3) + for r in range(row * 3, (row + 1) * 3) + for c in range(column * 3, (column + 1) * 3) ] )