From bd3abc82bd35a8a164f2e14d689311d2d9f2470d Mon Sep 17 00:00:00 2001 From: Pablo Moleri Date: Fri, 18 Sep 2009 01:34:33 +0000 Subject: More Pythonic code according to PEP8 --- diff --git a/src/MANIFEST b/Quinteti.activity/MANIFEST index 0e4067e..0e4067e 100644 --- a/src/MANIFEST +++ b/Quinteti.activity/MANIFEST diff --git a/src/MANIFEST.in b/Quinteti.activity/MANIFEST.in index 5b99791..5b99791 100644 --- a/src/MANIFEST.in +++ b/Quinteti.activity/MANIFEST.in diff --git a/src/NEWS b/Quinteti.activity/NEWS index 38f3f99..38f3f99 100644 --- a/src/NEWS +++ b/Quinteti.activity/NEWS diff --git a/src/TODO b/Quinteti.activity/TODO index 263c0af..263c0af 100644 --- a/src/TODO +++ b/Quinteti.activity/TODO diff --git a/src/activity.py b/Quinteti.activity/activity.py index 48ddb06..48ddb06 100644 --- a/src/activity.py +++ b/Quinteti.activity/activity.py diff --git a/src/activity/activity-quin-te-ti.svg b/Quinteti.activity/activity/activity-quin-te-ti.svg index 7e6ea7a..7e6ea7a 100644 --- a/src/activity/activity-quin-te-ti.svg +++ b/Quinteti.activity/activity/activity-quin-te-ti.svg diff --git a/src/activity/activity.info b/Quinteti.activity/activity/activity.info index 156ec9d..156ec9d 100644 --- a/src/activity/activity.info +++ b/Quinteti.activity/activity/activity.info diff --git a/src/gui/1.png b/Quinteti.activity/gui/1.png index c8406dc..c8406dc 100644 --- a/src/gui/1.png +++ b/Quinteti.activity/gui/1.png Binary files differ diff --git a/src/gui/1selected.png b/Quinteti.activity/gui/1selected.png index d7bb372..d7bb372 100644 --- a/src/gui/1selected.png +++ b/Quinteti.activity/gui/1selected.png Binary files differ diff --git a/src/gui/2.png b/Quinteti.activity/gui/2.png index 73477b5..73477b5 100644 --- a/src/gui/2.png +++ b/Quinteti.activity/gui/2.png Binary files differ diff --git a/src/gui/2selected.png b/Quinteti.activity/gui/2selected.png index 394e837..394e837 100644 --- a/src/gui/2selected.png +++ b/Quinteti.activity/gui/2selected.png Binary files differ diff --git a/src/gui/3.png b/Quinteti.activity/gui/3.png index 03a2215..03a2215 100644 --- a/src/gui/3.png +++ b/Quinteti.activity/gui/3.png Binary files differ diff --git a/src/gui/3selected.png b/Quinteti.activity/gui/3selected.png index 7d52ce8..7d52ce8 100644 --- a/src/gui/3selected.png +++ b/Quinteti.activity/gui/3selected.png Binary files differ diff --git a/src/gui/4.png b/Quinteti.activity/gui/4.png index 8e254cd..8e254cd 100644 --- a/src/gui/4.png +++ b/Quinteti.activity/gui/4.png Binary files differ diff --git a/src/gui/4selected.png b/Quinteti.activity/gui/4selected.png index 9554a85..9554a85 100644 --- a/src/gui/4selected.png +++ b/Quinteti.activity/gui/4selected.png Binary files differ diff --git a/src/gui/5.png b/Quinteti.activity/gui/5.png index 1ff2e49..1ff2e49 100644 --- a/src/gui/5.png +++ b/Quinteti.activity/gui/5.png Binary files differ diff --git a/src/gui/5selected.png b/Quinteti.activity/gui/5selected.png index 7b35178..7b35178 100644 --- a/src/gui/5selected.png +++ b/Quinteti.activity/gui/5selected.png Binary files differ diff --git a/src/gui/6.png b/Quinteti.activity/gui/6.png index bea0349..bea0349 100644 --- a/src/gui/6.png +++ b/Quinteti.activity/gui/6.png Binary files differ diff --git a/src/gui/6selected.png b/Quinteti.activity/gui/6selected.png index 72be814..72be814 100644 --- a/src/gui/6selected.png +++ b/Quinteti.activity/gui/6selected.png Binary files differ diff --git a/src/gui/7.png b/Quinteti.activity/gui/7.png index 58af7ad..58af7ad 100644 --- a/src/gui/7.png +++ b/Quinteti.activity/gui/7.png Binary files differ diff --git a/src/gui/7selected.png b/Quinteti.activity/gui/7selected.png index 9eab0ee..9eab0ee 100644 --- a/src/gui/7selected.png +++ b/Quinteti.activity/gui/7selected.png Binary files differ diff --git a/src/gui/8.png b/Quinteti.activity/gui/8.png index d5031b7..d5031b7 100644 --- a/src/gui/8.png +++ b/Quinteti.activity/gui/8.png Binary files differ diff --git a/src/gui/8selected.png b/Quinteti.activity/gui/8selected.png index 3120ea0..3120ea0 100644 --- a/src/gui/8selected.png +++ b/Quinteti.activity/gui/8selected.png Binary files differ diff --git a/src/gui/9.png b/Quinteti.activity/gui/9.png index 05d27c9..05d27c9 100644 --- a/src/gui/9.png +++ b/Quinteti.activity/gui/9.png Binary files differ diff --git a/src/gui/9selected.png b/Quinteti.activity/gui/9selected.png index ab4e6ba..ab4e6ba 100644 --- a/src/gui/9selected.png +++ b/Quinteti.activity/gui/9selected.png Binary files differ diff --git a/src/gui/__init__.py b/Quinteti.activity/gui/__init__.py index e69de29..e69de29 100644 --- a/src/gui/__init__.py +++ b/Quinteti.activity/gui/__init__.py diff --git a/src/gui/background.png b/Quinteti.activity/gui/background.png index 231a526..231a526 100644 --- a/src/gui/background.png +++ b/Quinteti.activity/gui/background.png Binary files differ diff --git a/src/gui/BoardUI.py b/Quinteti.activity/gui/board.py index 5cf5792..5cf5792 100644 --- a/src/gui/BoardUI.py +++ b/Quinteti.activity/gui/board.py diff --git a/src/gui/Button.py b/Quinteti.activity/gui/button.py index fb5b53d..fb5b53d 100644 --- a/src/gui/Button.py +++ b/Quinteti.activity/gui/button.py diff --git a/src/gui/Cell.py b/Quinteti.activity/gui/cell.py index 12adf05..12adf05 100644 --- a/src/gui/Cell.py +++ b/Quinteti.activity/gui/cell.py diff --git a/src/gui/instructions.png b/Quinteti.activity/gui/instructions.png index 946b9da..946b9da 100644 --- a/src/gui/instructions.png +++ b/Quinteti.activity/gui/instructions.png Binary files differ diff --git a/src/gui/instructions.svg b/Quinteti.activity/gui/instructions.svg index 5cd917a..5cd917a 100644 --- a/src/gui/instructions.svg +++ b/Quinteti.activity/gui/instructions.svg diff --git a/src/gui/instructions_button.png b/Quinteti.activity/gui/instructions_button.png index 8271cab..8271cab 100644 --- a/src/gui/instructions_button.png +++ b/Quinteti.activity/gui/instructions_button.png Binary files differ diff --git a/src/gui/player_win.png b/Quinteti.activity/gui/player_win.png index e9e6be2..e9e6be2 100644 --- a/src/gui/player_win.png +++ b/Quinteti.activity/gui/player_win.png Binary files differ diff --git a/src/gui/quinteti-new.png b/Quinteti.activity/gui/quinteti-new.png index 1659917..1659917 100644 --- a/src/gui/quinteti-new.png +++ b/Quinteti.activity/gui/quinteti-new.png Binary files differ diff --git a/src/logic/__init__.py b/Quinteti.activity/logic/__init__.py index e69de29..e69de29 100644 --- a/src/logic/__init__.py +++ b/Quinteti.activity/logic/__init__.py diff --git a/src/logic/GameState.py b/Quinteti.activity/logic/game.py index 1dfb2a0..1dfb2a0 100644 --- a/src/logic/GameState.py +++ b/Quinteti.activity/logic/game.py diff --git a/src/logic/Mesh.py b/Quinteti.activity/logic/mesh.py index 4744e75..4744e75 100644 --- a/src/logic/Mesh.py +++ b/Quinteti.activity/logic/mesh.py diff --git a/src/gui/GameMain.py b/Quinteti.activity/main.py index a842923..a842923 100644 --- a/src/gui/GameMain.py +++ b/Quinteti.activity/main.py diff --git a/src/olpcgames/COPYING b/Quinteti.activity/olpcgames/COPYING index b8adee0..b8adee0 100644 --- a/src/olpcgames/COPYING +++ b/Quinteti.activity/olpcgames/COPYING diff --git a/src/olpcgames/__init__.py b/Quinteti.activity/olpcgames/__init__.py index 504388c..504388c 100644 --- a/src/olpcgames/__init__.py +++ b/Quinteti.activity/olpcgames/__init__.py diff --git a/src/olpcgames/_cairoimage.py b/Quinteti.activity/olpcgames/_cairoimage.py index 3cfa22c..3cfa22c 100644 --- a/src/olpcgames/_cairoimage.py +++ b/Quinteti.activity/olpcgames/_cairoimage.py diff --git a/src/olpcgames/_gtkmain.py b/Quinteti.activity/olpcgames/_gtkmain.py index 33a6a83..33a6a83 100644 --- a/src/olpcgames/_gtkmain.py +++ b/Quinteti.activity/olpcgames/_gtkmain.py diff --git a/src/olpcgames/_version.py b/Quinteti.activity/olpcgames/_version.py index 6a4e1db..6a4e1db 100644 --- a/src/olpcgames/_version.py +++ b/Quinteti.activity/olpcgames/_version.py diff --git a/src/olpcgames/activity.py b/Quinteti.activity/olpcgames/activity.py index 538ba13..538ba13 100644 --- a/src/olpcgames/activity.py +++ b/Quinteti.activity/olpcgames/activity.py diff --git a/src/olpcgames/buildmanifest.py b/Quinteti.activity/olpcgames/buildmanifest.py index 899433b..899433b 100644 --- a/src/olpcgames/buildmanifest.py +++ b/Quinteti.activity/olpcgames/buildmanifest.py diff --git a/src/olpcgames/camera.py b/Quinteti.activity/olpcgames/camera.py index 249f295..249f295 100644 --- a/src/olpcgames/camera.py +++ b/Quinteti.activity/olpcgames/camera.py diff --git a/src/olpcgames/canvas.py b/Quinteti.activity/olpcgames/canvas.py index 2583827..2583827 100644 --- a/src/olpcgames/canvas.py +++ b/Quinteti.activity/olpcgames/canvas.py diff --git a/src/olpcgames/data/__init__.py b/Quinteti.activity/olpcgames/data/__init__.py index 8510186..8510186 100644 --- a/src/olpcgames/data/__init__.py +++ b/Quinteti.activity/olpcgames/data/__init__.py diff --git a/src/olpcgames/data/sleeping_svg.py b/Quinteti.activity/olpcgames/data/sleeping_svg.py index c52398a..c52398a 100644 --- a/src/olpcgames/data/sleeping_svg.py +++ b/Quinteti.activity/olpcgames/data/sleeping_svg.py diff --git a/src/olpcgames/dbusproxy.py b/Quinteti.activity/olpcgames/dbusproxy.py index a103e28..a103e28 100644 --- a/src/olpcgames/dbusproxy.py +++ b/Quinteti.activity/olpcgames/dbusproxy.py diff --git a/src/olpcgames/eventwrap.py b/Quinteti.activity/olpcgames/eventwrap.py index 402109c..402109c 100644 --- a/src/olpcgames/eventwrap.py +++ b/Quinteti.activity/olpcgames/eventwrap.py diff --git a/src/olpcgames/gtkEvent.py b/Quinteti.activity/olpcgames/gtkEvent.py index 6b20102..6b20102 100644 --- a/src/olpcgames/gtkEvent.py +++ b/Quinteti.activity/olpcgames/gtkEvent.py diff --git a/src/olpcgames/mesh.py b/Quinteti.activity/olpcgames/mesh.py index 1ad4c43..1ad4c43 100644 --- a/src/olpcgames/mesh.py +++ b/Quinteti.activity/olpcgames/mesh.py diff --git a/src/olpcgames/pangofont.py b/Quinteti.activity/olpcgames/pangofont.py index 441dfd1..441dfd1 100644 --- a/src/olpcgames/pangofont.py +++ b/Quinteti.activity/olpcgames/pangofont.py diff --git a/src/olpcgames/pausescreen.py b/Quinteti.activity/olpcgames/pausescreen.py index 113a0ea..113a0ea 100644 --- a/src/olpcgames/pausescreen.py +++ b/Quinteti.activity/olpcgames/pausescreen.py diff --git a/src/olpcgames/svgsprite.py b/Quinteti.activity/olpcgames/svgsprite.py index ad247dd..ad247dd 100644 --- a/src/olpcgames/svgsprite.py +++ b/Quinteti.activity/olpcgames/svgsprite.py diff --git a/src/olpcgames/textsprite.py b/Quinteti.activity/olpcgames/textsprite.py index 7663630..7663630 100644 --- a/src/olpcgames/textsprite.py +++ b/Quinteti.activity/olpcgames/textsprite.py diff --git a/src/olpcgames/util.py b/Quinteti.activity/olpcgames/util.py index 49a23b0..49a23b0 100644 --- a/src/olpcgames/util.py +++ b/Quinteti.activity/olpcgames/util.py diff --git a/src/olpcgames/video.py b/Quinteti.activity/olpcgames/video.py index 032aa13..032aa13 100644 --- a/src/olpcgames/video.py +++ b/Quinteti.activity/olpcgames/video.py diff --git a/src/setup.py b/Quinteti.activity/setup.py index 2258644..2258644 100644 --- a/src/setup.py +++ b/Quinteti.activity/setup.py diff --git a/quin-te-ti.e4p b/quin-te-ti.e4p deleted file mode 100644 index 489453c..0000000 --- a/quin-te-ti.e4p +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - en - Python - Qt4 - - - - - - src/setup.py - src/run.py - src/activity.py - src/logic/__init__.py - src/logic/GameState.py - src/logic/Mesh.py - src/gui/__init__.py - src/gui/Player.py - src/gui/BoardUI.py - src/gui/GameMain.py - src/olpcgames/_cairoimage.py - src/olpcgames/_gtkmain.py - src/olpcgames/camera.py - src/olpcgames/dbusproxy.py - src/olpcgames/svgsprite.py - src/olpcgames/_version.py - src/olpcgames/__init__.py - src/olpcgames/pausescreen.py - src/olpcgames/textsprite.py - src/olpcgames/pangofont.py - src/olpcgames/eventwrap.py - src/olpcgames/activity.py - src/olpcgames/buildmanifest.py - src/olpcgames/mesh.py - src/olpcgames/gtkEvent.py - src/olpcgames/util.py - src/olpcgames/video.py - src/olpcgames/canvas.py - src/olpcgames/data/sleeping_svg.py - src/olpcgames/data/__init__.py - src/gui/Cell.py - src/gui/Button.py - - - - - - - - - - - src/logic/__init__.py - src/logic/GameState.py - src/logic/Mesh.py - src/setup.py - src/run.py - src/gui/__init__.py - src/gui/Player.py - src/gui/BoardUI.py - src/gui/GameMain.py - src/activity.py - src/olpcgames/_cairoimage.py - src/olpcgames/_gtkmain.py - src/olpcgames/camera.py - src/olpcgames/dbusproxy.py - src/olpcgames/svgsprite.py - src/olpcgames/_version.py - src/olpcgames/__init__.py - src/olpcgames/pausescreen.py - src/olpcgames/data/sleeping_svg.py - src/olpcgames/data/__init__.py - src/olpcgames/textsprite.py - src/olpcgames/pangofont.py - src/olpcgames/eventwrap.py - src/olpcgames/activity.py - src/olpcgames/buildmanifest.py - src/olpcgames/mesh.py - src/olpcgames/gtkEvent.py - src/olpcgames/util.py - src/olpcgames/video.py - src/olpcgames/canvas.py - src/gui/1.png - src/gui/1selected.png - src/gui/2.png - src/gui/2selected.png - src/gui/3.png - src/gui/3selected.png - src/gui/4.png - src/gui/4selected.png - src/gui/5.png - src/gui/5selected.png - src/gui/6.png - src/gui/6selected.png - src/gui/7.png - src/gui/7selected.png - src/gui/8.png - src/gui/8selected.png - src/gui/9.png - src/gui/9selected.png - src/gui/background.png - src/gui/quinteti-new.png - instalar activity - interfaz.txt - quin-te-ti.e4p - src - src/gui/instructions.png - src/gui/instructions.svg - src/gui/instructions_button.png - src/gui/player_win.png - resources - - src/run.py - - PySvn - - - - add - - - - - - - - checkout - - - - - - - - commit - - - - - - - - diff - - - - - - - - export - - - - - - - - global - - - - - - - - history - - - - - - - - log - - - - - - - - remove - - - - - - - - status - - - - - - - - tag - - - - - - - - update - - - - - - - - - - - - standardLayout - - - False - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/create_maifest.sh b/src/create_maifest.sh deleted file mode 100644 index 79e89bd..0000000 --- a/src/create_maifest.sh +++ /dev/null @@ -1,2 +0,0 @@ -python setup_python.py sdist --manifest-only - diff --git a/src/gui/Player.py b/src/gui/Player.py deleted file mode 100644 index 051b2a7..0000000 --- a/src/gui/Player.py +++ /dev/null @@ -1,9 +0,0 @@ - -class Player: - name = None - - def __init__(self, name): - self.name = name - - def getName(self): - return self.name \ No newline at end of file diff --git a/src/run.py b/src/run.py deleted file mode 100644 index 7ad39cd..0000000 --- a/src/run.py +++ /dev/null @@ -1,13 +0,0 @@ -from gui import GameMain - -# Este modulo solo existe porque no se pudo enganchar directamente -# GameMain por estar dentro de un paquete. - -# Es importante definir la funcion 'main' para que sea invocada por sugar. -# El modulo se define en activity.py con el atributo game_name. -def main(): - GameMain.main() - -# Codigo para debug de este modulo: -if __name__ == "__main__": - main() diff --git a/src/setup_python.py b/src/setup_python.py deleted file mode 100644 index e5f55ae..0000000 --- a/src/setup_python.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env python - -from distutils.core import setup - -setup(name='Quinteti', - version='1.0', - description='Quinteti tictactoe', - author='Pablo Moleri', - author_email='pmoleri@gmail.com', - url='', - packages=['logic', 'gui'], - ) - -- cgit v0.9.1