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

9358: get_table_metadata(nav_type) anomaly; revert

Browse Source
This commit is contained in:
Doug Blank
2016-04-08 07:15:30 -04:00
parent d9ff7fede2
commit dd0f0c6f3e
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -727,9 +727,9 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
Private implementation of get_table_func. Private implementation of get_table_func.
""" """
if table is None: if table is None:
return list(self.__tables.keys()) return self.__tables.keys()
elif func is None: elif func is None:
return list(self.__tables[table].keys()) return self.__tables[table] # dict of functions
elif func in self.__tables[table].keys(): elif func in self.__tables[table].keys():
return self.__tables[table][func] return self.__tables[table][func]
else: else:
@@ -811,7 +811,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
def get_table_names(self): def get_table_names(self):
"""Return a list of valid table names.""" """Return a list of valid table names."""
return self.get_table_func() return list(self.get_table_func())
def get_table_metadata(self, table_name): def get_table_metadata(self, table_name):
"""Return the metadata for a valid table name.""" """Return the metadata for a valid table name."""

4
gramps/gen/proxy/filter.py
View File

@@ -181,9 +181,9 @@ class FilterProxyDb(ProxyDbBase):
Private implementation of get_table_func. Private implementation of get_table_func.
""" """
if table is None: if table is None:
return list(self.__tables.keys()) return self.__tables.keys()
elif func is None: elif func is None:
return list(self.__tables[table].keys()) return self.__tables[table].keys()
elif func in self.__tables[table].keys(): elif func in self.__tables[table].keys():
return self.__tables[table][func] return self.__tables[table][func]
else: else:

4
gramps/gen/proxy/living.py
View File

@@ -194,9 +194,9 @@ class LivingProxyDb(ProxyDbBase):
Private implementation of get_table_func. Private implementation of get_table_func.
""" """
if table is None: if table is None:
return list(self.__tables.keys()) return self.__tables.keys()
elif func is None: elif func is None:
return list(self.__tables[table].keys()) return self.__tables[table].keys()
elif func in self.__tables[table].keys(): elif func in self.__tables[table].keys():
return self.__tables[table][func] return self.__tables[table][func]
else: else:

4
gramps/gen/proxy/private.py
View File

@@ -164,9 +164,9 @@ class PrivateProxyDb(ProxyDbBase):
Private implementation of get_table_func. Private implementation of get_table_func.
""" """
if table is None: if table is None:
return list(self.__tables.keys()) return self.__tables.keys()
elif func is None: elif func is None:
return list(self.__tables[table].keys()) return self.__tables[table].keys()
elif func in self.__tables[table].keys(): elif func in self.__tables[table].keys():
return self.__tables[table][func] return self.__tables[table][func]
else: else:

4
gramps/gen/proxy/proxybase.py
View File

@@ -232,9 +232,9 @@ class ProxyDbBase(DbReadBase):
Private implementation of get_table_func. Private implementation of get_table_func.
""" """
if table is None: if table is None:
return list(self.__tables.keys()) return self.__tables.keys()
elif func is None: elif func is None:
return list(self.__tables[table].keys()) return self.__tables[table].keys()
elif func in self.__tables[table].keys(): elif func in self.__tables[table].keys():
return self.__tables[table][func] return self.__tables[table][func]
else: else:

4
gramps/gen/proxy/referencedbyselection.py
View File

@@ -193,9 +193,9 @@ class ReferencedBySelectionProxyDb(ProxyDbBase):
Private implementation of get_table_func. Private implementation of get_table_func.
""" """
if table is None: if table is None:
return list(self.__tables.keys()) return self.__tables.keys()
elif func is None: elif func is None:
return list(self.__tables[table].keys()) return self.__tables[table].keys()
elif func in self.__tables[table].keys(): elif func in self.__tables[table].keys():
return self.__tables[table][func] return self.__tables[table][func]
else: else:

6
gramps/plugins/database/bsddb_support/read.py
View File

@@ -482,9 +482,9 @@ class DbBsddbRead(DbReadBase, Callback):
Private implementation of get_table_func. Private implementation of get_table_func.
""" """
if table is None: if table is None:
return list(self.__tables.keys()) return self.__tables.keys()
elif func is None: elif func is None:
return list(self.__tables[table].keys()) return self.__tables[table].keys()
elif func in self.__tables[table].keys(): elif func in self.__tables[table].keys():
return self.__tables[table][func] return self.__tables[table][func]
else: else:
@@ -509,7 +509,7 @@ class DbBsddbRead(DbReadBase, Callback):
def get_table_names(self): def get_table_names(self):
"""Return a list of valid table names.""" """Return a list of valid table names."""
return self.get_table_func() return list(self.get_table_func())
def get_table_metadata(self, table_name): def get_table_metadata(self, table_name):
"""Return the metadata for a valid table name.""" """Return the metadata for a valid table name."""

4
gramps/plugins/database/bsddb_support/write.py
View File

@@ -385,9 +385,9 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
Private implementation of get_table_func. Private implementation of get_table_func.
""" """
if table is None: if table is None:
return list(self.__tables.keys()) return self.__tables.keys()
elif func is None: elif func is None:
return list(self.__tables[table].keys()) return self.__tables[table].keys()
elif func in self.__tables[table].keys(): elif func in self.__tables[table].keys():
return self.__tables[table][func] return self.__tables[table][func]
else: else: