From 114cac011c888b4a43372cd4a2e312ae5352b7c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Thu, 21 Apr 2022 14:37:47 +0200 Subject: [PATCH] misc: remove unused settings.CDNS (#64434) --- README.txt | 5 ----- gadjo/templatetags/gadjo.py | 24 ------------------------ 2 files changed, 29 deletions(-) diff --git a/README.txt b/README.txt index 1eac6b4..7fc266b 100644 --- a/README.txt +++ b/README.txt @@ -21,11 +21,6 @@ You should add gadjo.finders.XStaticFinder to STATICFILES_FINDERS, STATICFILES_FINDERS = global_settings.STATICFILES_FINDERS + \ ('gadjo.finders.XStaticFinder',) -There is a CDNS settings, that can contain a list of (cdn name, protocol) -tuples; for example: - - CDNS = [('google', 'https')] - Additional static files ------------------------ diff --git a/gadjo/templatetags/gadjo.py b/gadjo/templatetags/gadjo.py index 14f164d..1f2106c 100644 --- a/gadjo/templatetags/gadjo.py +++ b/gadjo/templatetags/gadjo.py @@ -15,32 +15,8 @@ register = template.Library() @register.simple_tag def xstatic(modname, filename): - try: - # list of tuples of the form (cdnname, protocol) - cdns = settings.CDNS - except AttributeError: - cdns = [] if settings.DEBUG: filename = filename.replace('.min.', '.') - - if cdns: - modname = str(modname.replace('-', '_')) - pkg = __import__('xstatic.pkg', fromlist=[modname]) - mod = getattr(pkg, modname) - for cdnname, protocol in cdns: - try: - base_url = XStatic(mod, provider=cdnname, protocol=protocol).base_url - except KeyError: - continue - if isinstance(base_url, str): - # base_url is often a str - return base_url + '/' + filename - else: - # But it also can be a dict (which maps relative paths to - # full urls) (this happens with jquery CDN) - if filename in base_url: - return base_url.get(filename) - return settings.STATIC_URL + 'xstatic/' + filename