Changeset 999
- Timestamp:
- 01/03/08 15:14:54
- Files:
-
- Shapely/trunk/shapely/predicates.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
Shapely/trunk/shapely/predicates.py
r751 r999 17 17 def __init__(self, fn): 18 18 self.fn = fn 19 def errcheck(result, func, argtuple): 20 if result == 2: 21 raise PredicateError, "Failed to evaluate %s" % repr(self.fn) 22 return result 23 self.fn.errcheck = errcheck 19 24 20 25 def __get__(self, obj, objtype=None): … … 23 28 24 29 def __call__(self, other): 25 retval = self.fn(self.context._geom, other._geom) 26 if retval == 2: 27 raise PredicateError, "Failed to evaluate %s" % repr(self.fn) 28 return bool(retval) 30 return bool(self.fn(self.context._geom, other._geom)) 29 31 30 32 … … 39 41 def __init__(self, fn): 40 42 self.fn = fn 43 def errcheck(result, func, argtuple): 44 if result == 2: 45 raise PredicateError, "Failed to evaluate %s" % repr(self.fn) 46 return result 47 self.fn.errcheck = errcheck 41 48 42 49 def __get__(self, obj, objtype=None): 43 retval = self.fn(obj._geom) 44 if retval == 2: 45 raise PredicateError, "Failed to evaluate %s" % repr(self.fn) 46 return bool(retval) 50 return bool(self.fn(obj._geom)) 47 51 48 52 def __set__(self, obj, value=None):
