From 324cea5dd3dd2246ae589e226a3f615310c3721a Mon Sep 17 00:00:00 2001
From: Doug Blank <dblank@cs.brynmawr.edu>
Date: Fri, 8 Apr 2016 07:30:02 -0400
Subject: [PATCH] 9358: get_table_metadata(nav_type) anomaly

---
 gramps/gen/db/generic.py                       | 2 +-
 gramps/gen/proxy/filter.py                     | 4 ++--
 gramps/gen/proxy/living.py                     | 4 ++--
 gramps/gen/proxy/private.py                    | 4 ++--
 gramps/gen/proxy/proxybase.py                  | 4 ++--
 gramps/gen/proxy/referencedbyselection.py      | 4 ++--
 gramps/plugins/database/bsddb_support/read.py  | 4 ++--
 gramps/plugins/database/bsddb_support/write.py | 4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gramps/gen/db/generic.py b/gramps/gen/db/generic.py
index 165ed8389..39fa05107 100644
--- a/gramps/gen/db/generic.py
+++ b/gramps/gen/db/generic.py
@@ -727,7 +727,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
         Private implementation of get_table_func.
         """
         if table is None:
-            return self.__tables.keys()
+            return list(self.__tables.keys())
         elif func is None:
             return self.__tables[table] # dict of functions
         elif func in self.__tables[table].keys():
diff --git a/gramps/gen/proxy/filter.py b/gramps/gen/proxy/filter.py
index f62f24fdc..81c6bb9ea 100644
--- a/gramps/gen/proxy/filter.py
+++ b/gramps/gen/proxy/filter.py
@@ -181,9 +181,9 @@ class FilterProxyDb(ProxyDbBase):
         Private implementation of get_table_func.
         """
         if table is None:
-            return self.__tables.keys()
+            return list(self.__tables.keys())
         elif func is None:
-            return self.__tables[table].keys()
+            return self.__tables[table]
         elif func in self.__tables[table].keys():
             return self.__tables[table][func]
         else: 
diff --git a/gramps/gen/proxy/living.py b/gramps/gen/proxy/living.py
index be91aa2f0..09a4fb7f2 100644
--- a/gramps/gen/proxy/living.py
+++ b/gramps/gen/proxy/living.py
@@ -194,9 +194,9 @@ class LivingProxyDb(ProxyDbBase):
         Private implementation of get_table_func.
         """
         if table is None:
-            return self.__tables.keys()
+            return list(self.__tables.keys())
         elif func is None:
-            return self.__tables[table].keys()
+            return self.__tables[table]
         elif func in self.__tables[table].keys():
             return self.__tables[table][func]
         else: 
diff --git a/gramps/gen/proxy/private.py b/gramps/gen/proxy/private.py
index a64b66998..7c306bfbd 100644
--- a/gramps/gen/proxy/private.py
+++ b/gramps/gen/proxy/private.py
@@ -164,9 +164,9 @@ class PrivateProxyDb(ProxyDbBase):
         Private implementation of get_table_func.
         """
         if table is None:
-            return self.__tables.keys()
+            return list(self.__tables.keys())
         elif func is None:
-            return self.__tables[table].keys()
+            return self.__tables[table]
         elif func in self.__tables[table].keys():
             return self.__tables[table][func]
         else: 
diff --git a/gramps/gen/proxy/proxybase.py b/gramps/gen/proxy/proxybase.py
index 9e060ddd2..958fb9631 100644
--- a/gramps/gen/proxy/proxybase.py
+++ b/gramps/gen/proxy/proxybase.py
@@ -232,9 +232,9 @@ class ProxyDbBase(DbReadBase):
         Private implementation of get_table_func.
         """
         if table is None:
-            return self.__tables.keys()
+            return list(self.__tables.keys())
         elif func is None:
-            return self.__tables[table].keys()
+            return self.__tables[table]
         elif func in self.__tables[table].keys():
             return self.__tables[table][func]
         else: 
diff --git a/gramps/gen/proxy/referencedbyselection.py b/gramps/gen/proxy/referencedbyselection.py
index 95ab46bae..eddd75b16 100644
--- a/gramps/gen/proxy/referencedbyselection.py
+++ b/gramps/gen/proxy/referencedbyselection.py
@@ -193,9 +193,9 @@ class ReferencedBySelectionProxyDb(ProxyDbBase):
         Private implementation of get_table_func.
         """
         if table is None:
-            return self.__tables.keys()
+            return list(self.__tables.keys())
         elif func is None:
-            return self.__tables[table].keys()
+            return self.__tables[table]
         elif func in self.__tables[table].keys():
             return self.__tables[table][func]
         else: 
diff --git a/gramps/plugins/database/bsddb_support/read.py b/gramps/plugins/database/bsddb_support/read.py
index ecb8b9c1e..6870415a1 100644
--- a/gramps/plugins/database/bsddb_support/read.py
+++ b/gramps/plugins/database/bsddb_support/read.py
@@ -482,9 +482,9 @@ class DbBsddbRead(DbReadBase, Callback):
         Private implementation of get_table_func.
         """
         if table is None:
-            return self.__tables.keys()
+            return list(self.__tables.keys())
         elif func is None:
-            return self.__tables[table].keys()
+            return self.__tables[table]
         elif func in self.__tables[table].keys():
             return self.__tables[table][func]
         else: 
diff --git a/gramps/plugins/database/bsddb_support/write.py b/gramps/plugins/database/bsddb_support/write.py
index 84ce1446e..8a4ff0fb7 100644
--- a/gramps/plugins/database/bsddb_support/write.py
+++ b/gramps/plugins/database/bsddb_support/write.py
@@ -385,9 +385,9 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
         Private implementation of get_table_func.
         """
         if table is None:
-            return self.__tables.keys()
+            return list(self.__tables.keys())
         elif func is None:
-            return self.__tables[table].keys()
+            return self.__tables[table]
         elif func in self.__tables[table].keys():
             return self.__tables[table][func]
         else: