From 7efe0ed7011177a3b4ea6a4561a80dfbd34d1f13 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Sat, 19 Apr 2008 19:55:23 +0000 Subject: Removed relative import from some modules --- diff --git a/Gambiarra/gambiarra.py b/Gambiarra/gambiarra.py index 3ef6da2..acbbc31 100644 --- a/Gambiarra/gambiarra.py +++ b/Gambiarra/gambiarra.py @@ -28,10 +28,11 @@ import pygame from pygame.locals import * import levels as Levels -from command import Play, Help, Quit -from gamemenu import GameMenu +from Gambiarra.command import Play, Help, Quit +from Gambiarra.gamemenu import GameMenu +import Gambiarra.levels as Levels -from objects import Esteira, check_collision +from Gambiarra.objects import Esteira, check_collision class Game(object): # controle do jogo diff --git a/Gambiarra/levels.py b/Gambiarra/levels.py index 27449b0..1fbc7d4 100644 --- a/Gambiarra/levels.py +++ b/Gambiarra/levels.py @@ -26,9 +26,9 @@ import os import simplejson as json -from objects import * +from Gambiarra.objects import * -from command import * +from Gambiarra.command import Play, Help, Quit class SimulationView(object): """ This widget holds the objects being simulated. """ diff --git a/Gambiarra/objects/__init__.py b/Gambiarra/objects/__init__.py index 836988c..f4e303c 100644 --- a/Gambiarra/objects/__init__.py +++ b/Gambiarra/objects/__init__.py @@ -1,10 +1,10 @@ -from animals import Penguin -from balls import SoccerBall, BowlingBall, BeachBall -from elastica import Elastica -from esteira import Esteira -from target import Target -from things import Thing, check_collision -from wall import UpWall, DownWall, LeftWall, RightWall +from Gambiarra.objects.animals import Penguin +from Gambiarra.objects.balls import SoccerBall, BowlingBall, BeachBall +from Gambiarra.objects.elastica import Elastica +from Gambiarra.objects.esteira import Esteira +from Gambiarra.objects.target import Target +from Gambiarra.objects.things import Thing, check_collision +from Gambiarra.objects.wall import UpWall, DownWall, LeftWall, RightWall # namespace cleanup del animals -- cgit v0.9.1