From ae027d877ab8983517cdfc10a582ee6d9d6d7e8f Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sun, 11 May 2014 19:20:21 +0200 Subject: [PATCH] One true import-style --- naja/gamestate.py | 6 +++--- naja/widgets/board.py | 5 ++--- naja/widgets/game_bits.py | 3 +-- naja/widgets/info_area.py | 2 +- naja/widgets/player_bits.py | 2 +- naja/widgets/tile.py | 9 ++++----- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/naja/gamestate.py b/naja/gamestate.py index 96e5505..a2eb77b 100644 --- a/naja/gamestate.py +++ b/naja/gamestate.py @@ -2,9 +2,9 @@ The current game state. """ -from .constants import BITS -from .gameboard import GameBoard -from .player import Player +from naja.constants import BITS +from naja.gameboard import GameBoard +from naja.player import Player class GameState(object): diff --git a/naja/widgets/board.py b/naja/widgets/board.py index 1f59f01..ac53d5d 100644 --- a/naja/widgets/board.py +++ b/naja/widgets/board.py @@ -3,9 +3,8 @@ Widget that holds the game tiles. """ from naja.constants import BOARD_SIZE, TILE_SIZE - -from .base import Widget -from .tile import TileWidget +from naja.widgets.base import Widget +from naja.widgets.tile import TileWidget class BoardWidget(Widget): diff --git a/naja/widgets/game_bits.py b/naja/widgets/game_bits.py index 875558c..fdb10fc 100644 --- a/naja/widgets/game_bits.py +++ b/naja/widgets/game_bits.py @@ -3,8 +3,7 @@ Widget that holds the games's bits. """ from naja.constants import BIT_SIZE - -from .base import Widget +from naja.widgets.base import Widget class GameBitsWidget(Widget): diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py index 2a9b50f..e0789ef 100644 --- a/naja/widgets/info_area.py +++ b/naja/widgets/info_area.py @@ -4,7 +4,7 @@ Widget for the game board information area. from naja.constants import INFO_SIZE -from .base import Widget +from naja.widgets.base import Widget class InfoAreaWidget(Widget): diff --git a/naja/widgets/player_bits.py b/naja/widgets/player_bits.py index 0214bda..70d5d11 100644 --- a/naja/widgets/player_bits.py +++ b/naja/widgets/player_bits.py @@ -2,8 +2,8 @@ Widget that holds the player's bits. """ -from .base import Widget from naja.constants import BIT_SIZE +from naja.widgets.base import Widget class PlayerBitsWidget(Widget): diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py index 1950996..7550ba5 100644 --- a/naja/widgets/tile.py +++ b/naja/widgets/tile.py @@ -1,12 +1,11 @@ -from naja.constants import TILE_SIZE -from naja.resources import resources - -from .base import Widget - # These will probably need to go away when we have images import pygame import pygame.locals as pgl +from naja.constants import TILE_SIZE +from naja.resources import resources +from naja.widgets.base import Widget + class TileWidget(Widget): """Widget which holds a tile on the game board.""" -- 2.34.1