← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/model/revision.py

  • Committer: Curtis Hovey
  • Date: 2011-08-12 14:39:51 UTC
  • mto: This revision was merged to the branch mainline in revision 13685.
  • Revision ID: curtis.hovey@canonical.com-20110812143951-74vfvrt37gtt4fz2
Sorted imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/model/revision.py
1
 
# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
2
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3
3
 
4
4
# pylint: disable-msg=E0611,W0212
49
49
from zope.interface import implements
50
50
from zope.security.proxy import removeSecurityProxy
51
51
 
 
52
from canonical.database.constants import (
 
53
    DEFAULT,
 
54
    UTC_NOW,
 
55
    )
 
56
from canonical.database.datetimecol import UtcDateTimeCol
 
57
from canonical.database.sqlbase import (
 
58
    quote,
 
59
    SQLBase,
 
60
    sqlvalues,
 
61
    )
 
62
from canonical.launchpad.helpers import shortlist
 
63
from canonical.launchpad.interfaces.emailaddress import (
 
64
    EmailAddressStatus,
 
65
    IEmailAddressSet,
 
66
    )
 
67
from canonical.launchpad.interfaces.lpstorm import IMasterStore, IStore
 
68
from canonical.launchpad.webapp.interfaces import (
 
69
    DEFAULT_FLAVOR,
 
70
    IStoreSelector,
 
71
    MAIN_STORE,
 
72
    )
52
73
from lp.code.interfaces.branch import DEFAULT_BRANCH_STATUS_IN_LISTING
53
74
from lp.code.interfaces.revision import (
54
75
    IRevision,
61
82
from lp.registry.interfaces.product import IProduct
62
83
from lp.registry.interfaces.projectgroup import IProjectGroup
63
84
from lp.registry.model.person import ValidPersonCache
64
 
from lp.services.database.constants import (
65
 
    DEFAULT,
66
 
    UTC_NOW,
67
 
    )
68
 
from lp.services.database.datetimecol import UtcDateTimeCol
69
 
from lp.services.database.lpstorm import (
70
 
    IMasterStore,
71
 
    IStore,
72
 
    )
73
 
from lp.services.database.sqlbase import (
74
 
    quote,
75
 
    SQLBase,
76
 
    sqlvalues,
77
 
    )
78
 
from lp.services.helpers import shortlist
79
 
from lp.services.identity.interfaces.emailaddress import (
80
 
    EmailAddressStatus,
81
 
    IEmailAddressSet,
82
 
    )
83
 
from lp.services.webapp.interfaces import (
84
 
    DEFAULT_FLAVOR,
85
 
    IStoreSelector,
86
 
    MAIN_STORE,
87
 
    )
88
85
 
89
86
 
90
87
class Revision(SQLBase):
165
162
            self.id == BranchRevision.revision_id,
166
163
            BranchRevision.branch_id == Branch.id)
167
164
        if not allow_private:
168
 
            query = And(query, Not(Branch.transitively_private))
 
165
            query = And(query, Not(Branch.private))
169
166
        if not allow_junk:
170
167
            query = And(
171
168
                query,
481
478
            Revision,
482
479
            And(revision_time_limit(day_limit),
483
480
                person_condition,
484
 
                Not(Branch.transitively_private)))
 
481
                Not(Branch.private)))
485
482
        result_set.config(distinct=True)
486
483
        return result_set.order_by(Desc(Revision.revision_date))
487
484
 
500
497
            ]
501
498
 
502
499
        conditions = And(revision_time_limit(day_limit),
503
 
                         Not(Branch.transitively_private))
 
500
                         Not(Branch.private))
504
501
 
505
502
        if IProduct.providedBy(obj):
506
503
            conditions = And(conditions, Branch.product == obj)