From 75b0cbb957510053760c1ae4f519cd6601040e96 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Mon, 31 Aug 2009 00:59:53 -0400 Subject: Fix checking for missing fields in XML response token = bug.find("token") self.token = token.text if token else None Was behaving strangely: apparently ElementTree can be logically false when non-None. Switch to the more explicit: self.token = None if token is None else token.text --- git-bz | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-bz b/git-bz index 86814ed..2316310 100755 --- a/git-bz +++ b/git-bz @@ -939,7 +939,7 @@ class Bug(object): if self.bug_status == "RESOLVED": self.resolution = bug.find("resolution").text token = bug.find("token") - self.token = token.text if token else None + self.token = None if token is None else token.text for attachment in bug.findall("attachment"): if attachment.get("ispatch") == "1" and not attachment.get("isobsolete") == "1" : @@ -951,11 +951,11 @@ class Bug(object): patch.description = attachment.find("desc").text patch.date = attachment.find("date").text status = attachment.find("status") - patch.status = status.text if status else None + patch.status = None if status is None else status.text patch.filename = attachment.find("filename").text patch.isprivate = attachment.get("isprivate") == "1" token = attachment.find("token") - patch.token = token.text if token else None + patch.token = None if token is None else token.text if attachmentdata: data = attachment.find("data").text -- cgit v1.2.3