← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/soyuz/model/archivepermission.py

  • Committer: Steve Kowalik
  • Date: 2011-08-07 04:05:52 UTC
  • mto: This revision was merged to the branch mainline in revision 13626.
  • Revision ID: stevenk@ubuntu.com-20110807040552-mwnxo0flmhvl35e8
Correct the notification based on review comments, and remove request{,ed}
from the function names, switching to create{,d}.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/soyuz/model/archivepermission.py
26
26
    implements,
27
27
    )
28
28
 
 
29
from canonical.database.constants import UTC_NOW
 
30
from canonical.database.datetimecol import UtcDateTimeCol
 
31
from canonical.database.enumcol import EnumCol
 
32
from canonical.database.sqlbase import (
 
33
    SQLBase,
 
34
    sqlvalues,
 
35
    )
 
36
from canonical.launchpad.interfaces.lpstorm import (
 
37
    IMasterStore,
 
38
    IStore,
 
39
    )
 
40
from canonical.launchpad.webapp.interfaces import (
 
41
    DEFAULT_FLAVOR,
 
42
    IStoreSelector,
 
43
    MAIN_STORE,
 
44
    )
29
45
from lp.app.errors import NotFoundError
30
46
from lp.registry.interfaces.distribution import IDistributionSet
31
47
from lp.registry.interfaces.sourcepackagename import (
32
48
    ISourcePackageName,
33
49
    ISourcePackageNameSet,
34
50
    )
35
 
from lp.services.database.constants import UTC_NOW
36
 
from lp.services.database.datetimecol import UtcDateTimeCol
37
 
from lp.services.database.enumcol import EnumCol
38
 
from lp.services.database.lpstorm import (
39
 
    IMasterStore,
40
 
    IStore,
41
 
    )
42
 
from lp.services.database.sqlbase import (
43
 
    SQLBase,
44
 
    sqlvalues,
45
 
    )
46
 
from lp.services.webapp.interfaces import (
47
 
    DEFAULT_FLAVOR,
48
 
    IStoreSelector,
49
 
    MAIN_STORE,
50
 
    )
51
 
from lp.soyuz.enums import ArchivePermissionType
52
51
from lp.soyuz.interfaces.archive import (
53
52
    ComponentNotFound,
54
53
    IArchive,
55
54
    )
 
55
from lp.soyuz.enums import ArchivePermissionType
56
56
from lp.soyuz.interfaces.archivepermission import (
57
57
    IArchivePermission,
58
58
    IArchivePermissionSet,
327
327
                archive=archive, person=person, component=component,
328
328
                permission=ArchivePermissionType.QUEUE_ADMIN)
329
329
 
330
 
    @staticmethod
331
 
    def _remove_permission(permission):
332
 
        if permission is None:
333
 
            # The permission has already been removed, so there's nothing more
334
 
            # to do here.
335
 
            return
336
 
        else:
337
 
            Store.of(permission).remove(permission)
338
 
 
339
330
    def deletePackageUploader(self, archive, person, sourcepackagename):
340
331
        """See `IArchivePermissionSet`."""
341
332
        sourcepackagename = self._nameToSourcePackageName(sourcepackagename)
343
334
            archive=archive, person=person,
344
335
            sourcepackagename=sourcepackagename,
345
336
            permission=ArchivePermissionType.UPLOAD)
346
 
        self._remove_permission(permission)
 
337
        Store.of(permission).remove(permission)
347
338
 
348
339
    def deleteComponentUploader(self, archive, person, component):
349
340
        """See `IArchivePermissionSet`."""
351
342
        permission = ArchivePermission.selectOneBy(
352
343
            archive=archive, person=person, component=component,
353
344
            permission=ArchivePermissionType.UPLOAD)
354
 
        self._remove_permission(permission)
 
345
        Store.of(permission).remove(permission)
355
346
 
356
347
    def deleteQueueAdmin(self, archive, person, component):
357
348
        """See `IArchivePermissionSet`."""
359
350
        permission = ArchivePermission.selectOneBy(
360
351
            archive=archive, person=person, component=component,
361
352
            permission=ArchivePermissionType.QUEUE_ADMIN)
362
 
        self._remove_permission(permission)
 
353
        Store.of(permission).remove(permission)
363
354
 
364
355
    def _nameToPackageset(self, packageset):
365
356
        """Helper to convert a possible string name to IPackageset."""
482
473
            ArchivePermission, archive=archive, person=person,
483
474
            packageset=packageset, permission=ArchivePermissionType.UPLOAD,
484
475
            explicit=explicit).one()
485
 
        self._remove_permission(permission)
 
476
 
 
477
        if permission is not None:
 
478
            # Permission found, remove it!
 
479
            store.remove(permission)
486
480
 
487
481
    def packagesetsForSourceUploader(
488
482
        self, archive, sourcepackagename, person):