From 560dc38a7994743fa15377f50451ebd9507f2c52 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 14 Feb 2017 11:15:04 -0200 Subject: [#907] Simplify static folder with @tuliocasagrande --- service/pixelated/resources/login_resource.py | 6 +++--- service/pixelated/resources/root_resource.py | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'service') diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py index 3a886aa0..6c0b6cdd 100644 --- a/service/pixelated/resources/login_resource.py +++ b/service/pixelated/resources/login_resource.py @@ -91,14 +91,14 @@ class LoginResource(BaseResource): def __init__(self, services_factory, provider=None, disclaimer_banner=None, authenticator=None): BaseResource.__init__(self, services_factory) - self._assets_folder = get_static_folder() self._disclaimer_banner = disclaimer_banner self._provider = provider self._authenticator = authenticator or Authenticator(provider) self._bootstrap_user_services = BootstrapUserServices(services_factory, provider) - self.putChild('assets', File(self._assets_folder)) - with open(os.path.join(self._assets_folder, 'interstitial.html')) as f: + static_folder = get_static_folder() + self.putChild('assets', File(static_folder)) + with open(os.path.join(static_folder, 'interstitial.html')) as f: self.interstitial = f.read() def getChild(self, path, request): diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py index be9c7458..beb40e88 100644 --- a/service/pixelated/resources/root_resource.py +++ b/service/pixelated/resources/root_resource.py @@ -51,17 +51,16 @@ MODE_RUNNING = 2 class RootResource(BaseResource): def __init__(self, services_factory): BaseResource.__init__(self, services_factory) - self._startup_assets_folder = get_static_folder() self._static_folder = get_static_folder() self._html_template = open(os.path.join(self._static_folder, 'index.html')).read() self._services_factory = services_factory self._child_resources = ChildResourcesMap() - with open(os.path.join(self._startup_assets_folder, 'Interstitial.html')) as f: + with open(os.path.join(self._static_folder, 'interstitial.html')) as f: self.interstitial = f.read() self._startup_mode() def _startup_mode(self): - self.putChild('startup-assets', File(self._startup_assets_folder)) + self.putChild('assets', File(self._static_folder)) self._mode = MODE_STARTUP def getChild(self, path, request): -- cgit v1.2.3