bug: Fix several issues with pickling

crobinso · crobinso · commit 333732868564 · 2020-01-12T16:25:07.000-05:00
* Cache bugzilla aliases internally, so we can restore them * Handle bugzilla == None in several places Closes: #105 Signed-off-by: Cole Robinson <crobinso@redhat.com>
diff --git a/bugzilla/bug.py b/bugzilla/bug.py
@@ -32,6 +32,10 @@ def __init__(self, bugzilla, bug_id=None, dict=None, autorefresh=False):
         self._rawdata = {}
         self.autorefresh = autorefresh
 
+        # pylint: disable=protected-access
+        self._aliases = self.bugzilla._get_bug_aliases()
+        # pylint: enable=protected-access
+
         if not dict:
             dict = {}
         if bug_id:
@@ -59,8 +63,10 @@ def __unicode__(self):
                                           self.assigned_to, self.summary)
 
     def __repr__(self):
-        return '<Bug #%i on %s at %#x>' % (self.bug_id, self.bugzilla.url,
-                                           id(self))
+        url = ""
+        if self.bugzilla:
+            url = self.bugzilla.url
+        return '<Bug #%i on %s at %#x>' % (self.bug_id, url, id(self))
 
     def __getattr__(self, name):
         refreshed = False
@@ -70,11 +76,7 @@ def __getattr__(self, name):
                 # have never been called.
                 return self.__dict__[name]
 
-            # pylint: disable=protected-access
-            aliases = self.bugzilla._get_bug_aliases()
-            # pylint: enable=protected-access
-
-            for newname, oldname in aliases:
+            for newname, oldname in self._aliases:
                 if name == oldname and newname in self.__dict__:
                     return self.__dict__[newname]
 
@@ -120,16 +122,10 @@ def refresh(self, include_fields=None, exclude_fields=None,
     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
+        if self.bugzilla:
+            self.bugzilla.post_translation({}, newdict)
 
-        for newname, oldname in aliases:
+        for newname, oldname in self._aliases:
             if oldname not in newdict:
                 continue
 
@@ -161,11 +157,15 @@ def _update_dict(self, newdict):
     ##################
 
     def __getstate__(self):
-        return self._rawdata
+        ret = self._rawdata.copy()
+        ret["_aliases"] = self._aliases
+        return ret
 
     def __setstate__(self, vals):
         self._rawdata = {}
         self.bugzilla = None
+        self._aliases = vals.get("_aliases", [])
+        self.autorefresh = False
         self._update_dict(vals)
 
 
diff --git a/tests/test_api_bug.py b/tests/test_api_bug.py
@@ -70,6 +70,8 @@ def _assert_bug():
     fd.seek(0)
     bug = pickle.load(fd)
     assert getattr(bug, "bugzilla") is None
+    assert str(bug)
+    assert repr(bug)
     bug.bugzilla = rhbz
     _assert_bug()
 
