From b7c7952058703fd30ddf531da48a6cca1513a82b Mon Sep 17 00:00:00 2001
From: Raphael Ackermann <raphael.ackermann@gmail.com>
Date: Wed, 9 Jan 2008 06:45:15 +0000
Subject: [PATCH] 2008-01-09 Raphael Ackermann <raphael.ackermann@gmail.com>

svn: r9760
---
 ChangeLog               |  5 +++++
 src/ArgHandler.py       |  4 ++--
 src/ViewManager.py      | 18 +++++-------------
 src/gen/proxy/filter.py |  5 ++---
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13ee1a054..e074ab917 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-09  Raphael Ackermann <raphael.ackermann@gmail.com>
+	* src/ViewManager.py: delete unneded method import_pkg
+	* src/ArgHandler.py: fix import CompressionError instead of CompressError 
+	* src/gen/proxy/filter.py: fix not needed family= line
+
 2008-01-08  Brian Matherly <brian@gramps-project.org>
 	* src/PluginUtils/_MenuOptions.py:
 	Fix 0001539: Tab order incorrect - Statistics Chart configuration
diff --git a/src/ArgHandler.py b/src/ArgHandler.py
index 262f814c6..47e164da9 100644
--- a/src/ArgHandler.py
+++ b/src/ArgHandler.py
@@ -2,7 +2,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2000-2006  Donald N. Allingham, A. Roitman
-# Copyright (C) 2007  B. Malengier
+# Copyright (C) 2007-2008  B. Malengier
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -527,7 +527,7 @@ class ArgHandler:
             except tarfile.ReadError, msg:
                 print "Error reading archive:", msg
                 sys.exit(1)
-            except tarfile.CompressError, msg:
+            except tarfile.CompressionError, msg:
                 print "Error uncompressing archive:", msg
                 sys.exit(1)
             except:
diff --git a/src/ViewManager.py b/src/ViewManager.py
index 840ccce18..a29b466dc 100644
--- a/src/ViewManager.py
+++ b/src/ViewManager.py
@@ -77,7 +77,7 @@ import UndoHistory
 from DbLoader import DbLoader
 import GrampsDisplay
 from gen.utils import ProgressMonitor
-import gen.db
+#import gen.db
 
 import ProgressDialog
 
@@ -210,10 +210,10 @@ class ViewManager:
     the others. All Views are held in the DisplayViews module. Examples of
     current views include:
 
-     - Person View
-     - Relationship View
-     - Family View
-     - Source View
+    - Person View
+    - Relationship View
+    - Family View
+    - Source View
 
     The View Manager does not have to know the number of views, the type of
     views, or any other details about the views. It simply provides the 
@@ -1033,14 +1033,6 @@ class ViewManager:
                     self._key = self.uistate.connect(
                         'nameformat-changed', self.active_page.build_tree)
 
-    def import_pkg(self, filename):
-        """
-        Imports a GRAMPS package
-        """
-        import ReadPkg
-        ReadPkg.impData(self.state.db, filename, self.uistate.pulse_progressbar)
-        self.__post_load()
-
     def import_data(self, obj):
         """
         Imports a file
diff --git a/src/gen/proxy/filter.py b/src/gen/proxy/filter.py
index 5130ba4ec..c364c1ba6 100644
--- a/src/gen/proxy/filter.py
+++ b/src/gen/proxy/filter.py
@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2007       Brian G. Matherly
+# Copyright (C) 2007-2008       Brian G. Matherly
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ __revision__ = "$Revision: 8864 $"
 # GRAMPS libraries
 #
 #-------------------------------------------------------------------------
-from gen.lib import *
+#from gen.lib import *
 from proxybase import ProxyDbBase
 
 class FilterProxyDb(ProxyDbBase):
@@ -64,7 +64,6 @@ class FilterProxyDb(ProxyDbBase):
         for handle in list(self.plist):
             person = self.db.get_person_from_handle(handle)
             for family_handle in person.get_family_handle_list():
-                family = self.db.get_family_from_handle(family_handle)
                 self.flist.add(family_handle)
 
     def get_person_from_handle(self, handle):