Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use db_is_open properly

Browse Source
This commit is contained in:
Doug Blank
2016-01-05 13:08:08 -05:00
parent c9b5830a37
commit 5130269f31
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gramps/gen/db/generic.py
View File

@@ -616,7 +616,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
self.set_feature("skip-check-xref", True) self.set_feature("skip-check-xref", True)
self.set_feature("skip-import-additions", True) self.set_feature("skip-import-additions", True)
self.readonly = False self.readonly = False
self.db_is_open = True self.db_is_open = False
self.name_formats = [] self.name_formats = []
# Bookmarks: # Bookmarks:
self.bookmarks = Bookmarks() self.bookmarks = Bookmarks()
@@ -788,6 +788,8 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
self.rmap_index = self.get_metadata('rmap_index', 0) self.rmap_index = self.get_metadata('rmap_index', 0)
self.nmap_index = self.get_metadata('nmap_index', 0) self.nmap_index = self.get_metadata('nmap_index', 0)
self.db_is_open = True
def version_supported(self): def version_supported(self):
"""Return True when the file has a supported version.""" """Return True when the file has a supported version."""
return True return True
@@ -1647,6 +1649,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
self.set_metadata('nmap_index', self.nmap_index) self.set_metadata('nmap_index', self.nmap_index)
self.close_backend() self.close_backend()
self.db_is_open = False
def get_bookmarks(self): def get_bookmarks(self):
return self.bookmarks return self.bookmarks
@@ -1811,7 +1814,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
return self.source_bookmarks return self.source_bookmarks
def is_open(self): def is_open(self):
return self._directory is not None return self.db_is_open
def iter_citations(self): def iter_citations(self):
return (Citation.create(data[1]) for data in self.get_citation_cursor()) return (Citation.create(data[1]) for data in self.get_citation_cursor())