From cdd291f43689275409157d3cfd8d7e84fcd63f7d Mon Sep 17 00:00:00 2001 From: Roald de Vries Date: Wed, 5 Oct 2016 15:25:42 -0300 Subject: remove pixelated realm's init parameters They weren't used. Currently, the PixelatedAuthSessionWrapper determines the resource to use for a user. It would be more idiomatic to have the realm determine that. Actually, it should return the avatar as an IResource. See http://twistedmatrix.com/documents/current/web/howto/web-in-60/http-auth.html --- service/pixelated/application.py | 2 +- service/pixelated/resources/auth.py | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'service/pixelated') diff --git a/service/pixelated/application.py b/service/pixelated/application.py index 15155386..7e83299a 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -174,7 +174,7 @@ def set_up_protected_resources(root_resource, provider, services_factory, checke session_checker = SessionChecker(services_factory) anonymous_resource = LoginResource(services_factory, disclaimer_banner=banner) - realm = PixelatedRealm(root_resource, anonymous_resource) + realm = PixelatedRealm() _portal = portal.Portal(realm, [checker, session_checker, AllowAnonymousAccess()]) protected_resource = PixelatedAuthSessionWrapper(_portal, root_resource, anonymous_resource, []) diff --git a/service/pixelated/resources/auth.py b/service/pixelated/resources/auth.py index 66aac4e5..a9297b30 100644 --- a/service/pixelated/resources/auth.py +++ b/service/pixelated/resources/auth.py @@ -88,10 +88,6 @@ class SessionChecker(object): class PixelatedRealm(object): implements(portal.IRealm) - def __init__(self, root_resource, anonymous_resource): - self._root_resource = root_resource - self._anonymous_resource = anonymous_resource - def requestAvatar(self, avatarId, mind, *interfaces): if IResource in interfaces: return IResource, avatarId, lambda: None -- cgit v1.2.3