From 48da910655c11a3215350459abd93e0c5f73d67f Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Wed, 3 Feb 2021 12:08:38 +0100 Subject: [PATCH] Fix inline resources when saving (#1956) * Fix inline resources when saving * Fix flake --- panel/io/resources.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/panel/io/resources.py b/panel/io/resources.py index a43ffe0dd8..26a0eb265a 100644 --- a/panel/io/resources.py +++ b/panel/io/resources.py @@ -11,7 +11,6 @@ from urllib.parse import urljoin from bokeh.resources import Resources -from bokeh.settings import settings from jinja2 import Environment, Markup, FileSystemLoader with open(Path(__file__).parent.parent / 'package.json') as f: @@ -39,9 +38,8 @@ def css_raw(self): css_txt = f.read() if css_txt not in raw: raw.append(css_txt) - resources = settings.resources(default='server') for cssf in glob.glob(str(DIST_DIR / 'css' / '*.css')): - if resources != 'inline': + if self.mode != 'inline': break with open(cssf, encoding='utf-8') as f: css_txt = f.read() @@ -56,8 +54,7 @@ def js_files(self): # Load requirejs last to avoid interfering with other libraries require_index = [i for i, jsf in enumerate(js_files) if 'require' in jsf] - resources = settings.resources(default='server') - if resources == 'server': + if self.mode == 'server': dist_dir = urljoin(self.root_url, LOCAL_DIST) else: dist_dir = CDN_DIST @@ -78,13 +75,12 @@ def css_files(self): if os.path.isfile(cssf) or cssf in files: continue files.append(cssf) - resources = settings.resources(default='server') - if resources == 'server': + if self.mode == 'server': dist_dir = urljoin(self.root_url, LOCAL_DIST) else: dist_dir = CDN_DIST for cssf in glob.glob(str(DIST_DIR / 'css' / '*.css')): - if resources == 'inline': + if self.mode == 'inline': break files.append(dist_dir + f'css/{os.path.basename(cssf)}') return files