Rebase and use DataDict

Rebase onto the upstream/master, and use DataDict wrapper.

Author: stevenyoungs

gramps/gen/lib/grampstype.py

@@ -247,8 +247,8 @@ def __get_str(cls, value, string):
             return cls._I2SMAP.get(value, _UNKNOWN)
 
     @classmethod
-    def get_str(cls, dict):
-        return cls.__get_str(dict["value"], dict["string"])
+    def get_str(cls, data):
+        return cls.__get_str(data.value, data.string)
 
     @classmethod
     def get_schema(cls):

gramps/gui/views/treemodels/eventmodel.py

@@ -145,7 +145,7 @@ def column_place(self, data):
             return ""
 
     def column_type(self, data):
-        return EventType.get_str(data["type"])
+        return EventType.get_str(data.type)
 
     def column_id(self, data):
         return data["gramps_id"]

gramps/gui/views/treemodels/familymodel.py

@@ -165,7 +165,7 @@ def sort_mother(self, data):
         return value
 
     def column_type(self, data):
-        return FamilyRelType.get_str(data["type"])
+        return FamilyRelType.get_str(data.type)
 
     def column_marriage(self, data):
         handle = data["handle"]

gramps/gui/views/treemodels/notemodel.py

@@ -118,7 +118,7 @@ def column_id(self, data):
 
     def column_type(self, data):
         """Return the type of the Note in readable format."""
-        return NoteType.get_str(data["type"])
+        return NoteType.get_str(data.type)
 
     def column_preview(self, data):
         """Return a shortend version of the Note's text."""

gramps/gui/views/treemodels/placemodel.py

@@ -188,7 +188,7 @@ def column_id(self, data):
         return data["gramps_id"]
 
     def column_type(self, data):
-        return PlaceType.get_str(data["place_type"])
+        return PlaceType.get_str(data.place_type)
 
     def column_code(self, data):
         return data["code"]

gramps/gui/views/treemodels/repomodel.py

@@ -134,7 +134,7 @@ def column_id(self, data):
         return data["gramps_id"]
 
     def column_type(self, data):
-        return RepositoryType.get_str(data["type"])
+        return RepositoryType.get_str(data.type)
 
     def column_name(self, data):
         return data["name"]