From 564b75e5ae9f5e406f039c0aa91b00d4d885235c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 30 May 2008 00:38:22 +0000 Subject: Fix Atom attribute handling in get_operator() and dep_getslot() to account for None return values. (trunk r10497) svn path=/main/branches/2.1.2/; revision=10498 --- pym/portage_dep.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/portage_dep.py b/pym/portage_dep.py index dea19063b..0d38cf516 100644 --- a/pym/portage_dep.py +++ b/pym/portage_dep.py @@ -310,8 +310,8 @@ def get_operator(mydep): @return: The operator. One of: '~', '=', '>', '<', '=*', '>=', or '<=' """ - operator = getattr(mydep, "operator", None) - if operator is not None: + operator = getattr(mydep, "operator", False) + if operator is not False: return operator if mydep: mydep = remove_slot(mydep) @@ -385,8 +385,8 @@ def dep_getslot(mydep): @rtype: String @return: The slot """ - slot = getattr(mydep, "slot", None) - if slot is not None: + slot = getattr(mydep, "slot", False) + if slot is not False: return slot colon = mydep.find(":") if colon != -1: -- cgit v1.2.3-1-g7c22