From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 25 Sep 2009 07:00:41 +0000 (-0000)
Subject: Remove ugly code from __len__, since defining __bool__ fixes the same
X-Git-Tag: v2.2_rc42~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0229a920129155f9a9b423db0ed33870a27c1d1;p=portage.git

Remove ugly code from __len__, since defining __bool__ fixes the same
issue.

svn path=/main/trunk/; revision=14428
---

diff --git a/pym/portage/proxy/objectproxy.py b/pym/portage/proxy/objectproxy.py
index dff4a07f7..a064d7056 100644
--- a/pym/portage/proxy/objectproxy.py
+++ b/pym/portage/proxy/objectproxy.py
@@ -47,15 +47,7 @@ class ObjectProxy(object):
 		return iter(object.__getattribute__(self, '_get_target')())
 
 	def __len__(self):
-		try:
-			return len(object.__getattribute__(self, '_get_target')())
-		except TypeError:
-			# For python 3.x with boolean target, len() results in
-			# TypeError, so return 0 or 1.
-			if bool(object.__getattribute__(self, '_get_target')()):
-				return 1
-			else:
-				return 0
+		return len(object.__getattribute__(self, '_get_target')())
 
 	def __repr__(self):
 		return repr(object.__getattribute__(self, '_get_target')())