[gnome-games] gnome-sudoku: Remove wildcard imports
- From: Zhang Sen <zhangsen src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-games] gnome-sudoku: Remove wildcard imports
- Date: Tue, 12 May 2009 06:08:24 -0400 (EDT)
commit 5ce42c0d2069305fd0d62b62c373d693d1f825ae
Author: Zhang Sen <zh jesse gmail com>
Date: Tue May 12 18:03:42 2009 +0800
gnome-sudoku: Remove wildcard imports
Part of the cleanup in bug 578903.
---
gnome-sudoku/src/lib/dialog_swallower.py | 1 -
gnome-sudoku/src/lib/game_selector.py | 5 +++--
gnome-sudoku/src/lib/main.py | 3 ++-
gnome-sudoku/src/lib/printing.py | 6 +++---
gnome-sudoku/src/lib/saver.py | 4 ++--
gnome-sudoku/src/lib/sudoku_generator_gui.py | 6 +++---
gnome-sudoku/src/lib/sudoku_maker.py | 8 ++++----
7 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/gnome-sudoku/src/lib/dialog_swallower.py b/gnome-sudoku/src/lib/dialog_swallower.py
index 5c8d513..0009292 100644
--- a/gnome-sudoku/src/lib/dialog_swallower.py
+++ b/gnome-sudoku/src/lib/dialog_swallower.py
@@ -64,7 +64,6 @@ if __name__ == '__main__':
d.vbox.add(gtk.Label('Foo, bar, baz'))
d.vbox.show_all()
d.add_button(gtk.STOCK_CLOSE,gtk.RESPONSE_CLOSE)
- import defaults
w = gtk.Window()
b = gtk.Button('show d'); b.show()
sa = SwappableArea(b)
diff --git a/gnome-sudoku/src/lib/game_selector.py b/gnome-sudoku/src/lib/game_selector.py
index ffd70f4..722a803 100644
--- a/gnome-sudoku/src/lib/game_selector.py
+++ b/gnome-sudoku/src/lib/game_selector.py
@@ -1,10 +1,11 @@
# -*- coding: utf-8 -*-
import gtk, gobject
+import os.path
import sudoku, saver, sudoku_maker
import sudoku_thumber
from gettext import gettext as _
from timer import format_time,format_friendly_date
-from defaults import *
+import defaults
from simple_debug import simple_debug
from colors import color_hex_to_float
from gtk_goodies import gconf_wrapper
@@ -40,7 +41,7 @@ class NewOrSavedGameSelector (gconf_wrapper.GConfWrapper):
NEW_GAME = 0
SAVED_GAME = 1
- ui_file = os.path.join(UI_DIR,'select_game.ui')
+ ui_file = os.path.join(defaults.UI_DIR, 'select_game.ui')
@simple_debug
def __init__ (self, sudokuMaker=None, gconf = None):
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index bcd4b91..21dd432 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -13,7 +13,8 @@ import game_selector
import threading
from gettext import gettext as _
from gettext import ngettext
-from defaults import *
+from defaults import (APPNAME, APPNAME_SHORT, AUTHORS, COPYRIGHT, DESCRIPTION,
+ IMAGE_DIR, LICENSE, MIN_NEW_PUZZLES, UI_DIR, VERSION, WEBSITE, WEBSITE_LABEL)
from timer import ActiveTimer
from simple_debug import simple_debug, options
from dialog_swallower import SwappableArea
diff --git a/gnome-sudoku/src/lib/printing.py b/gnome-sudoku/src/lib/printing.py
index 30bf136..c8314f0 100644
--- a/gnome-sudoku/src/lib/printing.py
+++ b/gnome-sudoku/src/lib/printing.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import gtk, cairo, time
-import sudoku, gsudoku, saver
-from defaults import *
+import os.path
+import sudoku, gsudoku, saver, defaults
from gtk_goodies import gconf_wrapper
def fit_squares_in_rectangle (width, height, n, margin=0):
@@ -113,7 +113,7 @@ def print_sudokus(*args,**kwargs):
class GamePrinter (gconf_wrapper.GConfWrapper):
- ui_file = os.path.join(UI_DIR,'print_games.ui')
+ ui_file = os.path.join(defaults.UI_DIR, 'print_games.ui')
initial_prefs = {'sudokus_per_page':2,
'print_multiple_sudokus_to_print':4,
diff --git a/gnome-sudoku/src/lib/saver.py b/gnome-sudoku/src/lib/saver.py
index b41495e..2fc500e 100644
--- a/gnome-sudoku/src/lib/saver.py
+++ b/gnome-sudoku/src/lib/saver.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import gtk, pickle, types, os, os.path, errno
-from defaults import *
+import defaults
from gtk_goodies.dialog_extras import show_message
from gettext import gettext as _
@@ -184,7 +184,7 @@ class SudokuTracker:
)
try:
filename = list_of_finished_games = os.path.join(
- os.path.join(DATA_DIR,'puzzles'),'finished'
+ os.path.join(defaults.DATA_DIR, 'puzzles'), 'finished'
)
ofi = open(list_of_finished_games,'a')
ofi.write(jar['game'].split('\n')[0]+'\n')
diff --git a/gnome-sudoku/src/lib/sudoku_generator_gui.py b/gnome-sudoku/src/lib/sudoku_generator_gui.py
index 582f68b..5420fe7 100644
--- a/gnome-sudoku/src/lib/sudoku_generator_gui.py
+++ b/gnome-sudoku/src/lib/sudoku_generator_gui.py
@@ -1,15 +1,15 @@
# -*- coding: utf-8 -*-
import gtk, gobject
-import sudoku
+import os.path
+import sudoku, defaults
from gtk_goodies import gconf_wrapper
-from defaults import *
from gettext import gettext as _
from gettext import ngettext
import threading
class GameGenerator (gconf_wrapper.GConfWrapper):
- ui_file = os.path.join(UI_DIR,'puzzle_generator.ui')
+ ui_file = os.path.join(defaults.UI_DIR, 'puzzle_generator.ui')
initial_prefs = {'generate_target_easy':1,
'generate_target_medium':0,
diff --git a/gnome-sudoku/src/lib/sudoku_maker.py b/gnome-sudoku/src/lib/sudoku_maker.py
index c4f34ab..52fafe4 100644
--- a/gnome-sudoku/src/lib/sudoku_maker.py
+++ b/gnome-sudoku/src/lib/sudoku_maker.py
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
import os, shutil
-import os.path
+import errno
import sudoku
import random
import time
import pausable
import threading
-from defaults import *
+import defaults
class SudokuGenerator:
@@ -298,7 +298,7 @@ class SudokuMaker:
'group_size':9},
puzzle_maker_args={'symmetrical':True},
batch_size = 5,
- pickle_to = os.path.join(DATA_DIR,'puzzles')):
+ pickle_to = os.path.join(defaults.DATA_DIR, 'puzzles')):
self.pickle_to = pickle_to
self.paused = False
self.terminated = False
@@ -317,7 +317,7 @@ class SudokuMaker:
if e.errno != errno.EEXIST:
return
for cat in sudoku.DifficultyRating.categories:
- source = os.path.join(os.path.join(PUZZLE_DIR),cat.replace(' ','_'))
+ source = os.path.join(os.path.join(defaults.PUZZLE_DIR), cat.replace(' ', '_'))
target = os.path.join(self.pickle_to, cat.replace(' ','_'))
if not os.path.exists(target):
try:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]