projects
/
naja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
137a56a
)
One true import-style
author
Stefano Rivera
<stefano@rivera.za.net>
Sun, 11 May 2014 17:20:21 +0000
(19:20 +0200)
committer
Stefano Rivera
<stefano@rivera.za.net>
Sun, 11 May 2014 17:20:32 +0000
(19:20 +0200)
naja/gamestate.py
patch
|
blob
|
history
naja/widgets/board.py
patch
|
blob
|
history
naja/widgets/game_bits.py
patch
|
blob
|
history
naja/widgets/info_area.py
patch
|
blob
|
history
naja/widgets/player_bits.py
patch
|
blob
|
history
naja/widgets/tile.py
patch
|
blob
|
history
diff --git
a/naja/gamestate.py
b/naja/gamestate.py
index 96e55056bf862b5243aed0198bd46e8a0ce097a7..a2eb77b2de2aea3dae40fee8a08d5e12272af3cd 100644
(file)
--- a/
naja/gamestate.py
+++ b/
naja/gamestate.py
@@
-2,9
+2,9
@@
The current game state.
"""
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):
class GameState(object):
diff --git
a/naja/widgets/board.py
b/naja/widgets/board.py
index 1f59f015f1cb1eacd5bb68de952986942c160b3c..ac53d5dd9c58f361a044588f89cf6d7f25e147c0 100644
(file)
--- 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 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):
class BoardWidget(Widget):
diff --git
a/naja/widgets/game_bits.py
b/naja/widgets/game_bits.py
index 875558cd76b068ffcf448cc2a7bb2c6bdbb6da74..fdb10fcd72ba7ef94435697ed8fc26cc30fac0a5 100644
(file)
--- 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 naja.constants import BIT_SIZE
-
-from .base import Widget
+from naja.widgets.base import Widget
class GameBitsWidget(Widget):
class GameBitsWidget(Widget):
diff --git
a/naja/widgets/info_area.py
b/naja/widgets/info_area.py
index 2a9b50f78ea4a612ddb269f9eb330e9e0c0be7d6..e0789ef47f45767f86b9b0e64358153b70b1257e 100644
(file)
--- 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 naja.constants import INFO_SIZE
-from .base import Widget
+from
naja.widgets
.base import Widget
class InfoAreaWidget(Widget):
class InfoAreaWidget(Widget):
diff --git
a/naja/widgets/player_bits.py
b/naja/widgets/player_bits.py
index 0214bda757639235fd601605632ddd1821235e57..70d5d1183a480c25f05d4e6a6fe17799f142ba51 100644
(file)
--- a/
naja/widgets/player_bits.py
+++ b/
naja/widgets/player_bits.py
@@
-2,8
+2,8
@@
Widget that holds the player's bits.
"""
Widget that holds the player's bits.
"""
-from .base import Widget
from naja.constants import BIT_SIZE
from naja.constants import BIT_SIZE
+from naja.widgets.base import Widget
class PlayerBitsWidget(Widget):
class PlayerBitsWidget(Widget):
diff --git
a/naja/widgets/tile.py
b/naja/widgets/tile.py
index 1950996aea0dd70391e6986d26d5cd242781fa2b..7550ba573ba147c4e39d3e0bccb7325bd318251e 100644
(file)
--- 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
# 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."""
class TileWidget(Widget):
"""Widget which holds a tile on the game board."""