[Checkins] SVN: BTrees/branches/py3k/ Sniff dict-like items correctly under Py3k.
Tres Seaver
cvs-admin at zope.org
Fri Dec 14 22:37:20 UTC 2012
Log message for revision 128671:
Sniff dict-like items correctly under Py3k.
Changed:
_U BTrees/branches/py3k/
U BTrees/branches/py3k/BTrees/BucketTemplate.c
-=-
Modified: BTrees/branches/py3k/BTrees/BucketTemplate.c
===================================================================
--- BTrees/branches/py3k/BTrees/BucketTemplate.c 2012-12-14 22:37:19 UTC (rev 128670)
+++ BTrees/branches/py3k/BTrees/BucketTemplate.c 2012-12-14 22:37:19 UTC (rev 128671)
@@ -486,8 +486,14 @@
* returns true for a PeristentMapping or PersistentDict, and we
* want to use items() in those cases too.
*/
+#ifdef PY3K
+#define ITERITEMS "items"
+#else
+#define ITERITEMS "iteritems"
+#endif
if (!PySequence_Check(seq) || /* or it "looks like a dict" */
- PyObject_HasAttrString(seq, "iteritems"))
+ PyObject_HasAttrString(seq, ITERITEMS))
+#undef ITERITEMS
{
PyObject *items;
items = PyObject_GetAttrString(seq, "items");
More information about the checkins
mailing list