From 4797b4de1146392e9da9927796745ea7921e65a2 Mon Sep 17 00:00:00 2001 From: lade043 <48773751+lade043@users.noreply.github.com> Date: Sun, 1 Mar 2020 20:25:48 +0100 Subject: [PATCH 1/4] Update game.py to make Python 3.x compatible For this, xrange was replaced by range and for imports of the own library lib.x was used instead of x. --- sensehatsnake/lib/game.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sensehatsnake/lib/game.py b/sensehatsnake/lib/game.py index 5b532e8..b142dde 100644 --- a/sensehatsnake/lib/game.py +++ b/sensehatsnake/lib/game.py @@ -1,9 +1,9 @@ from __future__ import print_function -from board import Board -from apple import Apple +from lib.board import Board +from lib.apple import Apple from mock import MagicMock, patch from random import randint -from snake import Snake +from lib.snake import Snake from tinydb import TinyDB, Query import math import pygame @@ -123,8 +123,8 @@ class Game: self.HEIGHT = self.BLOCK_SIZE * self.ROWS self.BACKGROUND_GRID = [ - [8 if x % 2 == y % 2 else 0 for x in xrange(self.COLUMNS)] - for y in xrange(self.ROWS) + [8 if x % 2 == y % 2 else 0 for x in range(self.COLUMNS)] + for y in range(self.ROWS) ] self.pygame.init() @@ -304,8 +304,8 @@ class Game: start_x, start_y = start_position end_x, end_y = start_position - for i in xrange(start_y, end_y): - for j in xrange(start_x, end_x): + for i in range(start_y, end_y): + for j in range(start_x, end_x): if start_x == end_x or start_y == end_y: self.sensehat.set_pixel(j, i, color) -- 2.39.5 From 07b1eaee1085e2ac5dc438011e545cd2a6bee3f1 Mon Sep 17 00:00:00 2001 From: lade043 <48773751+lade043@users.noreply.github.com> Date: Sun, 1 Mar 2020 20:27:18 +0100 Subject: [PATCH 2/4] Update board.py to make Python 3.x compatible Replaced xrange with range. --- sensehatsnake/lib/board.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sensehatsnake/lib/board.py b/sensehatsnake/lib/board.py index d417cde..3f594d4 100644 --- a/sensehatsnake/lib/board.py +++ b/sensehatsnake/lib/board.py @@ -17,8 +17,8 @@ class Board: def __generate(self): self.COORDINATES = [ - [0 for x in xrange(self.COLUMNS)] - for y in xrange(self.ROWS) + [0 for x in range(self.COLUMNS)] + for y in range(self.ROWS) ] def columns(self): -- 2.39.5 From 49c86e7001c5ebc0cd868a06b26162e1e5560726 Mon Sep 17 00:00:00 2001 From: lade043 <48773751+lade043@users.noreply.github.com> Date: Sun, 1 Mar 2020 20:28:14 +0100 Subject: [PATCH 3/4] Update snake.py to make Python 3.x compatible Replaced xrange with range. --- sensehatsnake/lib/snake.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sensehatsnake/lib/snake.py b/sensehatsnake/lib/snake.py index 168b207..3b85e97 100644 --- a/sensehatsnake/lib/snake.py +++ b/sensehatsnake/lib/snake.py @@ -88,8 +88,8 @@ class Snake: return self.COORDINATES coordinates = [ - [False for x in xrange(columns)] - for y in xrange(rows) + [False for x in range(columns)] + for y in range(rows) ] for segment in self.SEGMENTS: -- 2.39.5 From 3042da7465dbf6cff243f64e0e302c6e09e2208c Mon Sep 17 00:00:00 2001 From: lade043 <48773751+lade043@users.noreply.github.com> Date: Sun, 1 Mar 2020 20:32:29 +0100 Subject: [PATCH 4/4] Create dir data This is needed because in Python 3.x open("directory/file", "a") doesn't create the needed directory and tinydb needs this directory for the file data/data.json (see game.py, line 119). --- sensehatsnake/lib/data/.gitkeep | 1 + 1 file changed, 1 insertion(+) create mode 100644 sensehatsnake/lib/data/.gitkeep diff --git a/sensehatsnake/lib/data/.gitkeep b/sensehatsnake/lib/data/.gitkeep new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/sensehatsnake/lib/data/.gitkeep @@ -0,0 +1 @@ + -- 2.39.5