[Checkins] SVN: BTrees/branches/pure_python/ Don't mask the 'set' builtin.
Tres Seaver
cvs-admin at zope.org
Wed Nov 14 21:29:35 UTC 2012
Log message for revision 128288:
Don't mask the 'set' builtin.
Changed:
_U BTrees/branches/pure_python/
U BTrees/branches/pure_python/BTrees/_base.py
U BTrees/branches/pure_python/BTrees/tests/test__base.py
-=-
Modified: BTrees/branches/pure_python/BTrees/_base.py
===================================================================
--- BTrees/branches/pure_python/BTrees/_base.py 2012-11-14 21:29:34 UTC (rev 128287)
+++ BTrees/branches/pure_python/BTrees/_base.py 2012-11-14 21:29:35 UTC (rev 128288)
@@ -147,20 +147,20 @@
class _SetIteration(object):
- def __init__(self, set, useValues=False, default=None):
- if set is None:
- set = ()
- self.set = set
+ def __init__(self, to_iterate, useValues=False, default=None):
+ if to_iterate is None:
+ to_iterate = ()
+ self.to_iterate = to_iterate
if useValues:
try:
- itmeth = set.iteritems
+ itmeth = to_iterate.iteritems
except AttributeError:
- itmeth = set.__iter__
+ itmeth = to_iterate.__iter__
useValues = False
else:
self.value = None
else:
- itmeth = set.__iter__
+ itmeth = to_iterate.__iter__
self.useValues = useValues
self._next = itmeth().next
Modified: BTrees/branches/pure_python/BTrees/tests/test__base.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/test__base.py 2012-11-14 21:29:34 UTC (rev 128287)
+++ BTrees/branches/pure_python/BTrees/tests/test__base.py 2012-11-14 21:29:35 UTC (rev 128288)
@@ -14,7 +14,14 @@
import unittest
+def _assertRaises(self, e_type, checked, *args, **kw):
+ try:
+ checked(*args, **kw)
+ except e_type as e:
+ return e
+ self.fail("Didn't raise: %s" % e_type.__name__)
+
class Test_BucketBase(unittest.TestCase):
def _getTargetClass(self):
More information about the checkins
mailing list