refactor: bring back some code from past

ergo · Mar 6, 2018 · 8424788 · 8424788
1 parent e6e5b42
commit 8424788
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/ziggurat_foundations/__init__.py b/ziggurat_foundations/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from ziggurat_foundations.utils import ModelProxy
+from ziggurat_foundations.utils import ModelProxy, noop  # noqa
 
 __version__ = {'major': 0, 'minor': 8, 'patch': 0}
 
@@ -14,7 +14,7 @@ def import_model_service_mappings():
         UserPermissionService
     from ziggurat_foundations.models.services.user_resource_permission import \
         UserResourcePermissionService
-    from ziggurat_foundations.models.services.group_resource_permission import GroupResourcePermissionService # noqa
+    from ziggurat_foundations.models.services.group_resource_permission import GroupResourcePermissionService  # noqa
     from ziggurat_foundations.models.services.resource import ResourceService
     from ziggurat_foundations.models.services.resource_tree import \
         ResourceTreeService

diff --git a/ziggurat_foundations/ext/pyramid/sign_in.py b/ziggurat_foundations/ext/pyramid/sign_in.py
@@ -79,10 +79,6 @@ def session_provider_callable(request):
 
 
 class ZigguratSignInProvider(object):
-    signin_came_from_key = None
-    signin_username_key = None
-    signin_password_key = None
-    UserModel = None
 
     def __init__(self, *args, **kwargs):
         for k, v in kwargs.items():

diff --git a/ziggurat_foundations/permissions.py b/ziggurat_foundations/permissions.py
@@ -21,7 +21,7 @@ class AllPermissionsList(object):
         """ Stand in 'permission list' to represent all permissions """
 
         def __iter__(self):
-            yield
+            return ()
 
         def __contains__(self, other):
             return True