2008-02-18 Raphael Ackermann <raphael.ackermann@gmail.com>

* src/* 143 files
    * test/try_tree_model.py
    * windows/nsis/gcheck.py
    imports cleanup

svn: r10055

src/GrampsDbUtils/_GedcomLex.py

@@ -34,7 +34,8 @@ import re
 #
 #-------------------------------------------------------------------------
 
-from _GedcomInfo import *
+from GrampsDbUtils import (personalConstantEvents, personalConstantAttributes, 
+                           familyConstantEvents)
 import _GedcomTokens as GedcomTokens
 import gen.lib
 from DateHandler._DateParser import DateParser

src/GrampsDbUtils/_GrampsBSDDB.py

@@ -33,7 +33,6 @@ to version 2.2.x
 #-------------------------------------------------------------------------
 import cPickle as pickle
 import os
-import shutil
 import time
 from gettext import gettext as _
 from bsddb import dbshelve, db
@@ -45,14 +44,20 @@ __LOG = logging.getLogger(".GrampsDb")
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from gen.lib import *
-from gen.db.base import *
+from gen.lib import (GenderStats, Source, Person, Family, Event, Place, 
+                     MediaObject, Repository, Note, Attribute, AttributeType, 
+                     NoteType)
+from gen.db.base import (GrampsDbBase, KEY_TO_CLASS_MAP, CLASS_TO_KEY_MAP, 
+                         Transaction)
+from gen.db.cursor import GrampsCursor
+from gen.db.dbconst import (REFERENCE_KEY, PERSON_COL_KEY, EVENT_COL_KEY, 
+                            EVENT_KEY, FAMILY_KEY, SOURCE_KEY, PLACE_KEY, 
+                            MEDIA_KEY, REPOSITORY_KEY, PERSON_KEY, NOTE_KEY)
+from gen.db.exceptions import FileVersionError
 from gen.utils import db_copy
 import const
-from gen.db.exceptions import FileVersionError
 from BasicUtils import UpdateCallback
 
-from gen.db.cursor import GrampsCursor
 
 _MINVERSION = 9
 _DBVERSION = 13

src/GrampsDbUtils/_ReadGedcom.py

@@ -29,7 +29,7 @@
 #------------------------------------------------------------------------
 import os
 from gettext import gettext as _
-import gtk
+from gtk import glade
 
 #------------------------------------------------------------------------
 #
@@ -84,7 +84,7 @@ def importData(database, filename, callback=None, use_trans=False):
 
     if not gramps and ansel:
         glade_file = "%s/gedcomimport.glade" % os.path.dirname(__file__)
-        top = gtk.glade.XML(glade_file, 'encoding', 'gramps')
+        top = glade.XML(glade_file, 'encoding','gramps')
         code = top.get_widget('codeset')
         code.set_active(0)
         dialog = top.get_widget('encoding')

src/GrampsDbUtils/_ReadXML.py

@@ -28,7 +28,6 @@
 import os
 import sys
 import sets
-import shutil
 from xml.parsers.expat import ExpatError, ParserCreate
 from gettext import gettext as _
 import re
@@ -41,13 +40,11 @@ import re
 from QuestionDialog import ErrorDialog
 import Mime
 import gen.lib
-import const
 import Utils
 import DateHandler
 from BasicUtils import name_displayer
-from gen.db.dbconst import \
-     PERSON_KEY, FAMILY_KEY, SOURCE_KEY, EVENT_KEY, \
-     MEDIA_KEY, PLACE_KEY, REPOSITORY_KEY, NOTE_KEY
+from gen.db.dbconst import (PERSON_KEY, FAMILY_KEY, SOURCE_KEY, EVENT_KEY, 
+                            MEDIA_KEY, PLACE_KEY, REPOSITORY_KEY, NOTE_KEY)
 from BasicUtils import UpdateCallback
 
 #-------------------------------------------------------------------------

src/GrampsDbUtils/__init__.py

@@ -35,10 +35,10 @@ on using these factories see the _GrampsDbUtilsFactories.py file comments.
 
 """
 
-from _GrampsDbWRFactories import \
-     gramps_db_reader_factory
+from _GedcomInfo import (personalConstantEvents, familyConstantEvents, 
+                         personalConstantAttributes)
+from _GrampsDbWRFactories import gramps_db_reader_factory
      
-
 from _GedcomParse import GedcomParser
 from _WriteGedcom import GedcomWriter
 

src/GrampsDbUtils/test/GR_test.py

@@ -18,7 +18,7 @@ A controlling principle for such structures is that they should be
 designed for maximum ease (and intuitiveness) of data declaration
 """
 
-import sys, os, os.path as op
+import os.path as op
 
 import unittest as U
 import re

src/GrampsDbUtils/test/_GedcomChar_test.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import unittest
-import os, os.path
+import os.path
 import codecs
 import struct