diff options
| author | Roald de Vries <rdevries@thoughtworks.com> | 2016-12-05 10:56:24 +0100 |
|---|---|---|
| committer | Roald de Vries <rdevries@thoughtworks.com> | 2016-12-05 10:56:24 +0100 |
| commit | ae871e84f6de213f01299f2754fb2e68d4a3afe2 (patch) | |
| tree | 75ea49f16d9e9d2bc1e2a7691d4ce9bb49e967a0 /service/pixelated/application.py | |
| parent | ed69fa3b7bf0b543b6c5d3f41504965a1b085808 (diff) | |
remove templates folder from root resource parameters
Diffstat (limited to 'service/pixelated/application.py')
| -rw-r--r-- | service/pixelated/application.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/service/pixelated/application.py b/service/pixelated/application.py index 7263482d..1dc38d3c 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -42,10 +42,6 @@ from pixelated.resources.root_resource import RootResource log = Logger() -def get_templates_folder(): - return os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "templates") - - def get_static_folder(): # TODO: make sure sandbox keeps working # TODO: make sure this works for packaging @@ -103,7 +99,7 @@ def initialize(): args = arguments.parse_user_agent_args() logger.init(debug=args.debug) services_factory = _create_service_factory(args) - resource = RootResource(services_factory, templates_folder=get_templates_folder(), static_folder=get_static_folder()) + resource = RootResource(services_factory, static_folder=get_static_folder()) def start(): start_async = _start_mode(args, resource, services_factory) @@ -164,7 +160,7 @@ def _setup_multi_user(args, root_resource, services_factory): def set_up_protected_resources(root_resource, provider, services_factory, banner=None, authenticator=None): session_checker = SessionChecker(services_factory) - anonymous_resource = RootResource(services_factory, templates_folder=get_templates_folder(), static_folder=get_static_folder(), public=True) + anonymous_resource = RootResource(services_factory, static_folder=get_static_folder(), public=True) realm = PixelatedRealm(root_resource, anonymous_resource) _portal = portal.Portal(realm, [session_checker, AllowAnonymousAccess()]) |