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/DataViews/FamilyList.py

@@ -23,6 +23,20 @@
 FamilyList View.
 """
 
+#-------------------------------------------------------------------------
+#
+# Standard python modules
+#
+#-------------------------------------------------------------------------
+from gettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GNOME/GTK+ modules
+#
+#-------------------------------------------------------------------------
+import gtk
+
 #-------------------------------------------------------------------------
 #
 # gramps modules
@@ -37,14 +51,6 @@ import Config
 from Filters.SideBar import FamilySidebarFilter
 from ReportBase import CATEGORY_QR_FAMILY
 
-#-------------------------------------------------------------------------
-#
-# internationalization
-#
-#-------------------------------------------------------------------------
-from gettext import gettext as _
-import gtk
-
 #-------------------------------------------------------------------------
 #
 # FamilyListView

src/DataViews/GrampletView.py

@@ -24,12 +24,19 @@
 GrampletView interface.
 """
 
+#-------------------------------------------------------------------------
+#
+# gtk modules
+#
+#-------------------------------------------------------------------------
 import gtk
+from gtk import glade
 import gobject
+import pango
+
 import traceback
 import time
 import types
-import pango
 import os
 from gettext import gettext as _
 
@@ -415,7 +422,7 @@ class GuiGramplet:
         self.pui = None # user code
         self.tooltips = None
         self.tooltips_text = None
-        self.xml = gtk.glade.XML(const.GLADE_FILE, 'gvgramplet', "gramps")
+        self.xml = glade.XML(const.GLADE_FILE, 'gvgramplet', "gramps")
         self.mainframe = self.xml.get_widget('gvgramplet')
         self.textview = self.xml.get_widget('gvtextview')
         self.buffer = self.textview.get_buffer()

src/DataViews/PersonView.py

@@ -940,16 +940,13 @@ class PersonView(PageView.PersonNavView):
 
     def write_tabbed_file(self, name, type):
         """
-        Writes a tabbed file to the specified name. The output file type is determined
-        by the type variable.
+        Write a tabbed file to the specified name. 
+        
+        The output file type is determined by the type variable.
         """
         
-        # Select the correct output format
-        if type == 0:
-            from CSVTab import CSVTab as tabgen
-        else:
-            from ODSTab import ODSTab as tabgen
-
+        from docgen import CSVTab, ODSTab
+        ofile = None
         # build the active data columns, prepending 0 for the name column, then
         # derive the column names fromt the active data columns
 
@@ -958,10 +955,13 @@ class PersonView(PageView.PersonNavView):
                                if pair[0]]
 
         cnames = [column_names[i] for i in data_cols]
-
+        # Select the correct output format
+        if type == 0:
+            ofile = CSVTab(len(cnames))                        
+        else:
+            ofile = ODSTab(len(cnames))
+        
         # create the output tabbed document, and open it
-
-        ofile = tabgen(len(cnames))
         ofile.open(name)
 
         # start the current page