[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/Acquisition/ backport r99191 to 2.11
Log message for revision 99192:
backport r99191 to 2.11
Changed:
U Zope/branches/2.11/lib/python/Acquisition/_Acquisition.c
U Zope/branches/2.11/lib/python/Acquisition/tests.py
-=-
Modified: Zope/branches/2.11/lib/python/Acquisition/_Acquisition.c
===
--- Zope/branches/2.11/lib/python/Acquisition/_Acquisition.c2009-04-15
14:36:02 UTC (rev 99191)
+++ Zope/branches/2.11/lib/python/Acquisition/_Acquisition.c2009-04-15
14:44:17 UTC (rev 99192)
@@ -822,7 +822,7 @@
static PyObject *
Wrapper_iter(Wrapper *self)
{
- return CallMethodO(OBJECT(self), py__iter__, NULL, NULL);
+ return PyObject_GetIter(self-obj);
}
static PySequenceMethods Wrapper_as_sequence = {
Modified: Zope/branches/2.11/lib/python/Acquisition/tests.py
===
--- Zope/branches/2.11/lib/python/Acquisition/tests.py 2009-04-15 14:36:02 UTC
(rev 99191)
+++ Zope/branches/2.11/lib/python/Acquisition/tests.py 2009-04-15 14:44:17 UTC
(rev 99192)
@@ -1719,6 +1719,26 @@
iterating...
[42]
+Finally let's check that https://bugs.launchpad.net/zope2/+bug/360761
+has been fixed:
+
+ class C(Acquisition.Implicit):
+... l=[1,2,3]
+... def __getitem__(self, i):
+... return self.l[i]
+
+ c1 = C()
+ type(iter(c1))
+type 'iterator'
+ list(c1)
+[1, 2, 3]
+
+ c2 = C().__of__(c1)
+ type(iter(c2))
+type 'iterator'
+ list(c2)
+[1, 2, 3]
+
___
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Acquisition/ backport r99191 to 2.10
Log message for revision 99193:
backport r99191 to 2.10
Changed:
U Zope/branches/2.10/lib/python/Acquisition/_Acquisition.c
U Zope/branches/2.10/lib/python/Acquisition/tests.py
-=-
Modified: Zope/branches/2.10/lib/python/Acquisition/_Acquisition.c
===
--- Zope/branches/2.10/lib/python/Acquisition/_Acquisition.c2009-04-15
14:44:17 UTC (rev 99192)
+++ Zope/branches/2.10/lib/python/Acquisition/_Acquisition.c2009-04-15
14:44:25 UTC (rev 99193)
@@ -822,7 +822,7 @@
static PyObject *
Wrapper_iter(Wrapper *self)
{
- return CallMethodO(OBJECT(self), py__iter__, NULL, NULL);
+ return PyObject_GetIter(self-obj);
}
static PySequenceMethods Wrapper_as_sequence = {
Modified: Zope/branches/2.10/lib/python/Acquisition/tests.py
===
--- Zope/branches/2.10/lib/python/Acquisition/tests.py 2009-04-15 14:44:17 UTC
(rev 99192)
+++ Zope/branches/2.10/lib/python/Acquisition/tests.py 2009-04-15 14:44:25 UTC
(rev 99193)
@@ -1719,6 +1719,26 @@
iterating...
[42]
+Finally let's check that https://bugs.launchpad.net/zope2/+bug/360761
+has been fixed:
+
+ class C(Acquisition.Implicit):
+... l=[1,2,3]
+... def __getitem__(self, i):
+... return self.l[i]
+
+ c1 = C()
+ type(iter(c1))
+type 'iterator'
+ list(c1)
+[1, 2, 3]
+
+ c2 = C().__of__(c1)
+ type(iter(c2))
+type 'iterator'
+ list(c2)
+[1, 2, 3]
+
___
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ Updated to Acquisition 2.12.1.
Log message for revision 99203: Updated to Acquisition 2.12.1. Changed: U Zope/trunk/doc/CHANGES.rst _U Zope/trunk/include/ U Zope/trunk/versions-zope2.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2009-04-15 19:50:15 UTC (rev 99202) +++ Zope/trunk/doc/CHANGES.rst 2009-04-15 20:02:14 UTC (rev 99203) @@ -34,6 +34,8 @@ concept of protecting attribute 'set' does not exist in Zope 2, but it should be possible to re-use packages that do declare such protection. +- Updated to Acquisition 2.12.1. + - Updated to DateTime 2.12.0. - Updated to ZODB 3.9.0a12. Property changes on: Zope/trunk/include ___ Modified: svn:externals - Acquisition svn://svn.zope.org/repos/main/Acquisition/trunk/src/Acquisition ExtensionClass svn://svn.zope.org/repos/main/ExtensionClass/trunk/src/ExtensionClass persistent svn://svn.zope.org/repos/main/ZODB/tags/3.9.0a12/src/persistent + Acquisition svn://svn.zope.org/repos/main/Acquisition/tags/2.12.1/src/Acquisition ExtensionClass svn://svn.zope.org/repos/main/ExtensionClass/trunk/src/ExtensionClass persistent svn://svn.zope.org/repos/main/ZODB/tags/3.9.0a12/src/persistent Modified: Zope/trunk/versions-zope2.cfg === --- Zope/trunk/versions-zope2.cfg 2009-04-15 19:50:15 UTC (rev 99202) +++ Zope/trunk/versions-zope2.cfg 2009-04-15 20:02:14 UTC (rev 99203) @@ -3,7 +3,7 @@ versions = versions [versions] -Acquisition = 2.12.0a1 +Acquisition = 2.12.1 DateTime = 2.12.0 ExtensionClass = 2.11.1 Persistence = 2.11.1 ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/setup.py bump version number
Log message for revision 99205: bump version number Changed: U Zope/trunk/setup.py -=- Modified: Zope/trunk/setup.py === --- Zope/trunk/setup.py 2009-04-15 20:17:52 UTC (rev 99204) +++ Zope/trunk/setup.py 2009-04-15 22:03:29 UTC (rev 99205) @@ -19,7 +19,7 @@ EXTENSIONCLASS_INCLUDEDIRS = ['include', 'src'] params = dict(name='Zope2', -version='2.12.0.a1', +version='2.12.0.a2dev', url='http://www.zope.org', license='ZPL 2.1', description='Zope2 application server / web framework', ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
