From 15b2843d93fb873e633459d0b6d07d8fb06c8863 Mon Sep 17 00:00:00 2001
From: Doug Blank <doug.blank@gmail.com>
Date: Sun, 16 Dec 2007 17:03:25 +0000
Subject: [PATCH] 2007-12-16  Douglas S. Blank  <dblank@cs.brynmawr.edu> 
 * src/plugins/ReadPkg.py: attempt to os.remove(directory) failed 	*
 src/GrampsDb/_GrampsDbFactories.py: import from gen.db

svn: r9520
---
 ChangeLog                          | 4 ++++
 src/GrampsDb/_GrampsDbFactories.py | 9 ++++++---
 src/plugins/ReadPkg.py             | 9 +++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e0fd8cbf..da09bc2b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-16  Douglas S. Blank  <dblank@cs.brynmawr.edu>
+	* src/plugins/ReadPkg.py: attempt to os.remove(directory) failed
+	* src/GrampsDb/_GrampsDbFactories.py: import from gen.db
+
 2007-12-15  Brian Matherly <brian@gramps-project.org>
 	* src/ReportBase/_GraphvizReportDialog.py: Remove unnecessary code.
 
diff --git a/src/GrampsDb/_GrampsDbFactories.py b/src/GrampsDb/_GrampsDbFactories.py
index 9266141b7..1358269cf 100644
--- a/src/GrampsDb/_GrampsDbFactories.py
+++ b/src/GrampsDb/_GrampsDbFactories.py
@@ -62,16 +62,19 @@ def gramps_db_factory(db_type):
     """
 
     if db_type == const.APP_GRAMPS:
-        from _GrampsBSDDB import GrampsBSDDB
+        from gen.db import GrampsBSDDB
+        #from _GrampsBSDDB import GrampsBSDDB
         cls = GrampsBSDDB
 #    elif db_type == const.APP_GRAMPS_XML:
 #        from _GrampsXMLDB import GrampsXMLDB
 #        cls = GrampsXMLDB
     elif db_type == const.APP_GEDCOM:
-        from _GrampsGEDDB import GrampsGEDDB
+        from gen.db import GrampsGEDDB
+        #from _GrampsGEDDB import GrampsGEDDB
         cls = GrampsGEDDB
     elif db_type == 'x-directory/normal':
-        from _GrampsDBDir import GrampsDBDir
+        from gen.db import GrampsDBDir
+        #from _GrampsDBDir import GrampsGEDDB
         cls = GrampsDBDir
     else:
         raise GrampsDbException("Attempt to create unknown "
diff --git a/src/plugins/ReadPkg.py b/src/plugins/ReadPkg.py
index 9f3b41540..df319c22a 100644
--- a/src/plugins/ReadPkg.py
+++ b/src/plugins/ReadPkg.py
@@ -82,8 +82,13 @@ def impData(database, name, cb=None, cl=0):
     else:    # tempdir exists and writable -- clean it up if not empty
         files = os.listdir(tmpdir_path) ;
         for filename in files:
-            os.remove(os.path.join(tmpdir_path, filename))
-
+            try:
+                os.remove(os.path.join(tmpdir_path, filename))
+            except OSError:
+                try:
+                    os.removedirs(os.path.join(tmpdir_path, filename))
+                except:
+                    print "could not remove: '%s'" % os.path.join(tmpdir_path, filename)
     try:
         archive = tarfile.open(name)
         for tarinfo in archive: