[gentoo-commits] proj/gentoopm:master commit in: gentoopm/basepm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     029ea8d67ed8ab476533338f53c934acf1406749
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 20:05:45 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 20:05:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=029ea8d6

Py3: replace callable() with hasattr(..., '__call__').

---
 gentoopm/basepm/pkg.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gentoopm/basepm/pkg.py b/gentoopm/basepm/pkg.py
index 06b3fee..caa639e 100644
--- a/gentoopm/basepm/pkg.py
+++ b/gentoopm/basepm/pkg.py
@@ -92,12 +92,12 @@ class PMPackage(PMAtom, FillMissingComparisons):
 		"""
 
 		for f in args:
-			if callable(f): # a matcher
-				if not f(self):
-					return False
-			elif isinstance(f, PMAtom): # an atom
+			if isinstance(f, PMAtom): # an atom
 				if not self in f:
 					return False
+			elif hasattr(f, '__call__'):
+				if not f(self):
+					return False
 			else:
 				raise ValueError('Incorrect positional argument: %s' % f)