Skip to content

Commit

Permalink
flake8 cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
keul committed Feb 1, 2016
1 parent ba77b3b commit f6989fd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
16 changes: 8 additions & 8 deletions src/pas/plugins/sqlalchemy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ def initialize(context):
if plugin.Plugin.meta_type not in MultiPlugins:
registerMultiPlugin(plugin.Plugin.meta_type)
context.registerClass(
plugin.Plugin,
permission=add_user_folders,
icon=os.path.join(os.path.dirname(os.path.realpath(__file__)),
'www', 'sql.png'),
constructors=(plugin.manage_addSqlalchemyPluginForm,
plugin.addSqlalchemyPlugin),
visibility=None
)
plugin.Plugin,
permission=add_user_folders,
icon=os.path.join(os.path.dirname(os.path.realpath(__file__)),
'www', 'sql.png'),
constructors=(plugin.manage_addSqlalchemyPluginForm,
plugin.addSqlalchemyPlugin),
visibility=None
)
9 changes: 4 additions & 5 deletions src/pas/plugins/sqlalchemy/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -844,8 +844,6 @@ def addPrincipalToGroup(self, principal_id, group_id):
if not principal:
return False
principal = self._add_principal(zope_id=principal.getId())
#principal = session.query(self.principal_class)\
# .filter_by(zope_id=principal_id).first()

group.members.append(principal)
return True
Expand Down Expand Up @@ -886,11 +884,12 @@ def removePrincipalFromGroup(self, principal_id, group_id):

group.members.remove(user)

# If user doesn't belongs to this PAS plugin, garbage can be left behind
# If user doesn't belongs to this plugin, garbage can be left behind
# in that case we can have orphan items in the principals table
full_user = session.query(self.user_class).filter_by(id=user.id).first()
full_user = session.query(self.user_class).filter_by(id=user.id)\
.first()
relations_left = session.query(model.group_member_table).filter(
model.group_member_table.c.principal_id==user.id
model.group_member_table.c.principal_id == user.id
).count()
if not full_user and relations_left == 0:
session.query(self.principal_class).filter_by(id=user.id)\
Expand Down

0 comments on commit f6989fd

Please sign in to comment.