Skip to content

Commit

Permalink
refactor: remove everything deprecated in 0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@ergo
ergo committed Feb 18, 2018
1 parent aeedf3a commit 0990075
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 580 deletions.
47 changes: 1 addition & 46 deletions ziggurat_foundations/models/external_identity.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@

import sqlalchemy as sa
from sqlalchemy.ext.declarative import declared_attr
from zope.deprecation import deprecation

from ziggurat_foundations.models.base import BaseModel
from ziggurat_foundations.models.base import get_db_session
from ziggurat_foundations.models.services.external_identity import \
ExternalIdentityService


__all__ = ['ExternalIdentityMixin']

Expand Down Expand Up @@ -59,45 +56,3 @@ def alt_token(self):
@declared_attr
def token_secret(self):
return sa.Column(sa.Unicode(512), default=u'')

@classmethod
@deprecation.deprecate("ExternalIdentity.by_external_id_and_provider "
"will be removed in 0.8, use service instead")
def by_external_id_and_provider(cls, external_id, provider_name,
db_session=None):
"""
Backwards compatible alias to
:class:`ziggurat_foundations.models.services.external_identity.ExternalIdentityService.by_external_id_and_provider`
.. deprecated:: 0.8
:param external_id:
:param provider_name:
:param db_session:
:return: ExternalIdentity
"""
db_session = get_db_session(db_session)
return ExternalIdentityService.by_external_id_and_provider(
external_id=external_id, provider_name=provider_name,
db_session=db_session)

@classmethod
@deprecation.deprecate("ExternalIdentity.user_by_external_id_and_provider "
"will be removed in 0.8, use service instead")
def user_by_external_id_and_provider(cls, external_id, provider_name,
db_session=None):
"""
Backwards compatible alias to
:class:`ziggurat_foundations.models.services.external_identity.ExternalIdentityService.user_by_external_id_and_provider`
.. deprecated:: 0.8
:param external_id:
:param provider_name:
:param db_session:
:return: User
"""
db_session = get_db_session(db_session)
return ExternalIdentityService.user_by_external_id_and_provider(
external_id=external_id, provider_name=provider_name,
db_session=db_session)
58 changes: 1 addition & 57 deletions ziggurat_foundations/models/group.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@

import sqlalchemy as sa
from sqlalchemy.ext.declarative import declared_attr
from zope.deprecation import deprecation

from ziggurat_foundations.models.base import BaseModel
from ziggurat_foundations.models.base import get_db_session
from ziggurat_foundations.models.services.group import GroupService


__all__ = ['GroupMixin']

Expand Down Expand Up @@ -112,57 +110,3 @@ def validate_permission(self, key, permission):

def __repr__(self):
return '<Group: %s, %s>' % (self.group_name, self.id)

@classmethod
@deprecation.deprecate("Group.by_group_name "
"will be removed in 0.8, use service instead")
def by_group_name(cls, group_name, db_session=None):
""" fetch group by name
.. deprecated:: 0.8
"""
db_session = get_db_session(db_session)
return GroupService.by_group_name(group_name=group_name,
db_session=db_session)

@deprecation.deprecate("Group.get_user_paginator "
"will be removed in 0.8, use service instead")
def get_user_paginator(self, page=1, item_count=None, items_per_page=50,
user_ids=None, GET_params=None, db_session=None):
"""
.. deprecated:: 0.8
:param page:
:param item_count:
:param items_per_page:
:param user_ids:
:param GET_params:
:param db_session:
:return:
"""
return GroupService.get_user_paginator(
self, page=page, item_count=item_count,
items_per_page=items_per_page,
user_ids=user_ids, GET_params=GET_params)

@deprecation.deprecate("Group.resources_with_possible_perms "
"will be removed in 0.8, use service instead")
def resources_with_possible_perms(self, perm_names=None, resource_ids=None,
resource_types=None,
db_session=None):
"""
.. deprecated:: 0.8
:param perm_names:
:param resource_ids:
:param resource_types:
:param db_session:
:return:
"""
db_session = get_db_session(db_session, self)
return GroupService.resources_with_possible_perms(
self, perm_names=perm_names, resource_ids=resource_ids,
resource_types=resource_types, db_session=db_session)
24 changes: 1 addition & 23 deletions ziggurat_foundations/models/group_permission.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
import sqlalchemy as sa
from sqlalchemy.ext.declarative import declared_attr
from sqlalchemy.orm import validates
from zope.deprecation import deprecation

from ziggurat_foundations.models.base import BaseModel
from ziggurat_foundations.models.base import get_db_session
from ziggurat_foundations.models.services.group_permission import \
GroupPermissionService


__all__ = ['GroupPermissionMixin']

Expand Down Expand Up @@ -43,22 +40,3 @@ def validate_perm_name(self, key, value):

def __repr__(self):
return '<GroupPermission: %s>' % self.perm_name

@classmethod
@deprecation.deprecate("GroupPermission.by_group_and_perm "
"will be removed in 0.8, use service instead")
def by_group_and_perm(cls, group_id, perm_name, db_session=None):
"""
.. deprecated:: 0.8
:param group_id:
:param perm_name:
:param db_session:
:return:
"""
db_session = get_db_session(db_session)
return GroupPermissionService.by_group_and_perm(
group_id=group_id,
perm_name=perm_name,
db_session=db_session)
2 changes: 0 additions & 2 deletions ziggurat_foundations/models/group_resource_permission.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
from sqlalchemy.orm import validates

from ziggurat_foundations.models.base import BaseModel
from ziggurat_foundations.models.services.group_resource_permission import \
GroupResourcePermissionService

__all__ = ['GroupResourcePermissionMixin']

Expand Down
125 changes: 0 additions & 125 deletions ziggurat_foundations/models/resource.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,128 +113,3 @@ def validate_permission(self, key, permission):
raise AssertionError('perm_name is not one of {}'.format(
self.__possible_permissions__))
return permission

@deprecation.deprecate("Resource.perms_for_user "
"will be removed in 0.8, use service instead")
def perms_for_user(self, user, db_session=None):
"""
.. deprecated:: 0.8
:param user:
:param db_session:
:return:
"""
db_session = get_db_session(db_session, self)
return ResourceService.perms_for_user(
self, user=user, db_session=db_session)

@deprecation.deprecate("Resource.direct_perms_for_user "
"will be removed in 0.8, use service instead")
def direct_perms_for_user(self, user, db_session=None):
"""
.. deprecated:: 0.8
:param user:
:param db_session:
:return:
"""
db_session = get_db_session(db_session, self)
return ResourceService.direct_perms_for_user(
self, user=user, db_session=db_session)

@deprecation.deprecate("Resource.group_perms_for_user "
"will be removed in 0.8, use service instead")
def group_perms_for_user(self, user, db_session=None):
"""
.. deprecated:: 0.8
:param user:
:param db_session:
:return:
"""
db_session = get_db_session(db_session, self)
return ResourceService.group_perms_for_user(
self, user=user, db_session=db_session)

@deprecation.deprecate("Resource.users_for_perm "
"will be removed in 0.8, use service instead")
def users_for_perm(self, perm_name, user_ids=None, group_ids=None,
limit_group_permissions=False, skip_group_perms=False,
db_session=None):
"""
.. deprecated:: 0.8
:param perm_name:
:param user_ids:
:param group_ids:
:param limit_group_permissions:
:param skip_group_perms:
:param db_session:
:return:
"""
db_session = get_db_session(db_session, self)
return ResourceService.users_for_perm(
self, perm_name, user_ids=user_ids, group_ids=group_ids,
limit_group_permissions=limit_group_permissions,
skip_group_perms=skip_group_perms, db_session=db_session)

@classmethod
@deprecation.deprecate("Resource.by_resource_id "
"will be removed in 0.8, use service instead")
def by_resource_id(cls, resource_id, db_session=None):
"""
.. deprecated:: 0.8
:param resource_id:
:param db_session:
:return:
"""
db_session = get_db_session(db_session)
return ResourceService.by_resource_id(resource_id=resource_id,
db_session=db_session)

@classmethod
@deprecation.deprecate("Resource.perm_by_group_and_perm_name "
"will be removed in 0.8, use service instead")
def perm_by_group_and_perm_name(cls, res_id, group_id, perm_name,
db_session=None):
"""
.. deprecated:: 0.8
:param res_id:
:param group_id:
:param perm_name:
:param db_session:
:return:
"""
db_session = get_db_session(db_session)
return ResourceService.perm_by_group_and_perm_name(
resource_id=res_id, group_id=group_id, perm_name=perm_name,
db_session=db_session)

@deprecation.deprecate("Resource.groups_for_perm "
"will be removed in 0.8, use service instead")
def groups_for_perm(self, perm_name, group_ids=None,
limit_group_permissions=False,
db_session=None):
"""
.. deprecated:: 0.8
:param perm_name:
:param group_ids:
:param limit_group_permissions:
:param db_session:
:return:
"""
db_session = get_db_session(db_session, self)
return ResourceService.groups_for_perm(
self, perm_name=perm_name, group_ids=group_ids,
limit_group_permissions=limit_group_permissions,
db_session=db_session)

0 comments on commit 0990075

Please sign in to comment.