Author: kpvdr
Date: Thu Jun 5 13:41:54 2008
New Revision: 663730
URL: http://svn.apache.org/viewvc?rev=663730&view=rev
Log:
Minor additions to Range and RangedSet
Modified:
incubator/qpid/trunk/qpid/python/qpid/datatypes.py
Modified: incubator/qpid/trunk/qpid/python/qpid/datatypes.py
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/datatypes.py?rev=663730&r1=663729&r2=663730&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/qpid/datatypes.py (original)
+++ incubator/qpid/trunk/qpid/python/qpid/datatypes.py Thu Jun 5 13:41:54 2008
@@ -168,9 +168,15 @@
def __contains__(self, n):
return self.lower <= n and n <= self.upper
+
+ def __iter__(self):
+ i = self.lower
+ while i <= self.upper:
+ yield i
+ i += 1
def touches(self, r):
- # XXX
+ # XXX: are we doing more checks than we need?
return (self.lower - 1 in r or
self.upper + 1 in r or
r.lower - 1 in self or
@@ -223,6 +229,9 @@
def add(self, lower, upper = None):
self.add_range(Range(lower, upper))
+
+ def __iter__(self):
+ return iter(self.ranges)
def __repr__(self):
return str(self.ranges)
