Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Quiñones <manuq@laptop.org>2012-05-24 20:08:18 (GMT)
committer Manuel Quiñones <manuq@laptop.org>2012-05-24 20:08:18 (GMT)
commite45ac5b15ff3925c1a3b8fa9381c4a912fb8be43 (patch)
tree7995bbf8c4aae43674502d5fc6127532d3e51271
parent3981fa2562bdc0b229d911b038e0ce9c4f252713 (diff)
PEP8 test activity cleanup
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
-rw-r--r--test/TestActivity.py21
-rwxr-xr-xtest/TestGame.py35
2 files changed, 30 insertions, 26 deletions
diff --git a/test/TestActivity.py b/test/TestActivity.py
index 28c6f33..1338ff2 100644
--- a/test/TestActivity.py
+++ b/test/TestActivity.py
@@ -11,15 +11,16 @@ from sugar.graphics.toolbutton import ToolButton
from sugar.activity.widgets import StopButton
-sys.path.append('..') # Import sugargame package from top directory.
+sys.path.append('..') # Import sugargame package from top directory.
import sugargame.canvas
import TestGame
+
class TestActivity(sugar.activity.activity.Activity):
def __init__(self, handle):
super(TestActivity, self).__init__(handle)
-
+
self.paused = False
# Create the game instance.
@@ -31,13 +32,15 @@ class TestActivity(sugar.activity.activity.Activity):
# Build the Pygame canvas.
self._pygamecanvas = sugargame.canvas.PygameCanvas(self)
- # Note that set_canvas implicitly calls read_file when resuming from the Journal.
+ # Note that set_canvas implicitly calls read_file when
+ # resuming from the Journal.
self.set_canvas(self._pygamecanvas)
-
- # Start the game running (self.game.run is called when the activity constructor returns).
+
+ # Start the game running (self.game.run is called when the
+ # activity constructor returns).
self._pygamecanvas.run_pygame(self.game.run)
-
- def build_toolbar(self):
+
+ def build_toolbar(self):
toolbar_box = ToolbarBox()
self.set_toolbar_box(toolbar_box)
toolbar_box.show()
@@ -72,7 +75,7 @@ class TestActivity(sugar.activity.activity.Activity):
# Pause or unpause the game.
self.paused = not self.paused
self.game.set_paused(self.paused)
-
+
# Update the button to show the next action.
if self.paused:
button.set_icon('media-playback-start')
@@ -83,6 +86,6 @@ class TestActivity(sugar.activity.activity.Activity):
def read_file(self, file_path):
self.game.read_file(file_path)
-
+
def write_file(self, file_path):
self.game.write_file(file_path)
diff --git a/test/TestGame.py b/test/TestGame.py
index d9dbc2e..223c675 100755
--- a/test/TestGame.py
+++ b/test/TestGame.py
@@ -2,6 +2,7 @@
import pygame
import gtk
+
class TestGame:
def __init__(self):
# Set up a clock for managing the frame rate.
@@ -14,7 +15,7 @@ class TestGame:
self.vy = 0
self.paused = False
-
+
def set_paused(self, paused):
self.paused = paused
@@ -25,11 +26,11 @@ class TestGame:
# Called to load the state of the game from the Journal.
def read_file(self, file_path):
pass
-
+
# The main game loop.
def run(self):
- self.running = True
-
+ self.running = True
+
screen = pygame.display.get_surface()
while self.running:
@@ -43,40 +44,40 @@ class TestGame:
return
elif event.type == pygame.VIDEORESIZE:
pygame.display.set_mode(event.size, pygame.RESIZABLE)
-
+
# Move the ball
if not self.paused:
self.x += self.vx
if self.x > screen.get_width() + 100:
self.x = -100
-
+
self.y += self.vy
if self.y > screen.get_height() - 100:
self.y = screen.get_height() - 100
self.vy = -self.vy
-
- self.vy += 5;
-
+
+ self.vy += 5
+
# Clear Display
- screen.fill((255,255,255)) #255 for white
+ screen.fill((255, 255, 255)) # 255 for white
# Draw the ball
- pygame.draw.circle(screen, (255,0,0), (self.x, self.y), 100)
-
+ pygame.draw.circle(screen, (255, 0, 0), (self.x, self.y), 100)
+
# Flip Display
- pygame.display.flip()
-
+ pygame.display.flip()
+
# Try to stay at 30 FPS
self.clock.tick(30)
+
# This function is called when the game is run directly from the command line:
-# ./TestGame.py
+# ./TestGame.py
def main():
pygame.init()
pygame.display.set_mode((0, 0), pygame.RESIZABLE)
- game = TestGame()
+ game = TestGame()
game.run()
if __name__ == '__main__':
main()
-