Bug: Track all API data internally as _rawdata

crobinso · crobinso · commit 4823ef9e7a4d · 2020-01-12T16:24:15.000-05:00
This simplifies things compared to just tracking the field names,
at the expense of some memory, but will help implement things like
CLI JSON output

Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/bug.py b/bugzilla/bug.py
@@ -29,7 +29,7 @@ def __init__(self, bugzilla, bug_id=None, dict=None, autorefresh=False):
         # API had pre-existing issue that we can't change ('dict' usage)
 
         self.bugzilla = bugzilla
-        self._bug_fields = []
+        self._rawdata = {}
         self.autorefresh = autorefresh
 
         if not dict:
@@ -111,41 +111,45 @@ def refresh(self, include_fields=None, exclude_fields=None,
         Refresh the bug with the latest data from bugzilla
         """
         # pylint: disable=protected-access
+        extra_fields = list(self._rawdata.keys()) + (extra_fields or [])
         r = self.bugzilla._getbug(self.bug_id,
             include_fields=include_fields, exclude_fields=exclude_fields,
-            extra_fields=self._bug_fields + (extra_fields or []))
+            extra_fields=extra_fields)
         # pylint: enable=protected-access
         self._update_dict(r)
     reload = refresh
 
+    def _translate_dict(self, newdict):
+        if not self.bugzilla:
+            return
+
+        self.bugzilla.post_translation({}, newdict)
+
+        # pylint: disable=protected-access
+        aliases = self.bugzilla._get_bug_aliases()
+        # pylint: enable=protected-access
+
+        for newname, oldname in aliases:
+            if oldname not in newdict:
+                continue
+
+            if newname not in newdict:
+                newdict[newname] = newdict[oldname]
+            elif newdict[newname] != newdict[oldname]:
+                log.debug("Update dict contained differing alias values "
+                          "d[%s]=%s and d[%s]=%s , dropping the value "
+                          "d[%s]", newname, newdict[newname], oldname,
+                        newdict[oldname], oldname)
+            del(newdict[oldname])
+
+
     def _update_dict(self, newdict):
         """
         Update internal dictionary, in a way that ensures no duplicate
         entries are stored WRT field aliases
         """
-        if self.bugzilla:
-            self.bugzilla.post_translation({}, newdict)
-
-            # pylint: disable=protected-access
-            aliases = self.bugzilla._get_bug_aliases()
-            # pylint: enable=protected-access
-
-            for newname, oldname in aliases:
-                if oldname not in newdict:
-                    continue
-
-                if newname not in newdict:
-                    newdict[newname] = newdict[oldname]
-                elif newdict[newname] != newdict[oldname]:
-                    log.debug("Update dict contained differing alias values "
-                              "d[%s]=%s and d[%s]=%s , dropping the value "
-                              "d[%s]", newname, newdict[newname], oldname,
-                            newdict[oldname], oldname)
-                del(newdict[oldname])
-
-        for key in newdict.keys():
-            if key not in self._bug_fields:
-                self._bug_fields.append(key)
+        self._translate_dict(newdict)
+        self._rawdata.update(newdict)
         self.__dict__.update(newdict)
 
         if 'id' not in self.__dict__ and 'bug_id' not in self.__dict__:
@@ -157,13 +161,10 @@ def _update_dict(self, newdict):
     ##################
 
     def __getstate__(self):
-        ret = {}
-        for key in self._bug_fields:
-            ret[key] = self.__dict__[key]
-        return ret
+        return self._rawdata
 
     def __setstate__(self, vals):
-        self._bug_fields = []
+        self._rawdata = {}
         self.bugzilla = None
         self._update_dict(vals)
 
