1
=== modified file 'lib/canonical/launchpad/webapp/batching.py'
2
--- lib/canonical/launchpad/webapp/batching.py	2010-08-25 19:32:37 +0000
3
+++ lib/canonical/launchpad/webapp/batching.py	2010-09-06 18:54:46 +0000
4
@@ -4,13 +4,10 @@
5
4
__metaclass__ = type
4
__metaclass__ = type
6
5
5
7
6
import lazr.batchnavigator
6
import lazr.batchnavigator
8
7
from storm import Undef
9
8
# and ISQLObjectResultSet
10
9
from storm.zope.interfaces import IResultSet
7
from storm.zope.interfaces import IResultSet
11
10
from zope.component import adapts
8
from zope.component import adapts
12
11
from zope.interface import implements
9
from zope.interface import implements
13
12
from zope.interface.common.sequence import IFiniteSequence
10
from zope.interface.common.sequence import IFiniteSequence
14
13
from zope.security.proxy import removeSecurityProxy
15
14
11
16
15
from canonical.config import config
12
from canonical.config import config
17
16
from canonical.launchpad.webapp.interfaces import ITableBatchNavigator
13
from canonical.launchpad.webapp.interfaces import ITableBatchNavigator
18
@@ -32,24 +29,6 @@
19
32
        return iter(self.context)
29
        return iter(self.context)
20
33
30
21
34
    def __len__(self):
31
    def __len__(self):
22
35
        # XXX 2010-08-24 leonardr bug=620508
23
36
        #
24
37
        # Slicing a ResultSet object returns a copy with ._limit and
25
38
        # ._offset set appropriately. The original object's ._limit
26
39
        # and ._offset are not affected. However, the original and
27
40
        # the copy share a _select object, which means the original
28
41
        # object's ._select.limit and ._select.offset are shared with
29
42
        # the copy.
30
43
        #
31
44
        # This breaks Storm--count() is not supported on a ResultSet
32
45
        # that has a limit or offset set. This code sets
33
46
        # ._select.limit and ._select.offset to the appropriate values
34
47
        # before running the count() query, just as __getitem__ sets
35
48
        # those values before running its query.
36
49
        resultset = removeSecurityProxy(self.context)
37
50
        if hasattr(resultset, '_select'):
38
51
            resultset._select.limit = Undef
39
52
            resultset._select.offset = Undef
40
53
        return self.context.count()
32
        return self.context.count()
41
54
33
42
55
34
43
56
35
44
=== modified file 'versions.cfg'
45
--- versions.cfg	2010-09-05 10:46:30 +0000
46
+++ versions.cfg	2010-09-06 18:54:46 +0000
47
@@ -64,7 +64,10 @@
48
64
simplesettings = 0.4
64
simplesettings = 0.4
49
65
SimpleTal = 4.1
65
SimpleTal = 4.1
50
66
sourcecodegen = 0.6.9
66
sourcecodegen = 0.6.9
52
67
storm = 0.17
67
# lp:~gary/storm/0.17-launchpad has the branch for this distribution.  It is
53
68
# 0.17 plus r374 from storm trunk for fixing lp:620508 (in order to address
54
69
# lp:627442).
55
70
storm = 0.17-launchpad-1
56
68
testtools = 0.9.6
71
testtools = 0.9.6
57
69
transaction = 1.0.0
72
transaction = 1.0.0
58
70
Twisted = 10.1.0
73
Twisted = 10.1.0
Reviewer	Review Type	Date Requested	Status
Graham Binns (community)	release-critical	2010-09-06	Approve on 2010-09-06
Robert Collins (community)		2010-09-06	Approve on 2010-09-06
Review via email: mp+34701@code.launchpad.net