diff options
| author | Michael Merickel <michael@merickel.org> | 2015-12-08 11:24:35 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-12-08 11:24:35 -0600 |
| commit | ffad12b0ac1ee24ad12d6d1a2f300da1ec004010 (patch) | |
| tree | d4d4806615203910bdf4a06968a9032f123298e5 | |
| parent | eedef93f0c4c52ea11320bcd49386262fa7293a1 (diff) | |
| download | pyramid-ffad12b0ac1ee24ad12d6d1a2f300da1ec004010.tar.gz pyramid-ffad12b0ac1ee24ad12d6d1a2f300da1ec004010.tar.bz2 pyramid-ffad12b0ac1ee24ad12d6d1a2f300da1ec004010.zip | |
pass the raw asset spec into the cache buster
| -rw-r--r-- | pyramid/config/views.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pyramid/config/views.py b/pyramid/config/views.py index 1115ccffc..44003127a 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -2119,7 +2119,7 @@ class StaticURLInfo(object): def _bust_asset_path(self, registry, spec, subpath, kw): pkg_name, pkg_subpath = spec.split(':') - absspec = rawspec = '{0}:{1}{2}'.format(pkg_name, pkg_subpath, subpath) + rawspec = None overrides = registry.queryUtility(IPackageOverrides, name=pkg_name) if overrides is not None: resource_name = posixpath.join(pkg_subpath, subpath) @@ -2130,6 +2130,9 @@ class StaticURLInfo(object): rawspec = '{0}:{1}'.format(source.pkg_name, rawspec) break + if rawspec is None: + rawspec = '{0}:{1}{2}'.format(pkg_name, pkg_subpath, subpath) + for base_spec, cachebust in reversed(self.cache_busters): if ( base_spec == rawspec or @@ -2139,6 +2142,6 @@ class StaticURLInfo(object): else base_spec.endswith('/') ) and rawspec.startswith(base_spec) ): - subpath, kw = cachebust(absspec, subpath, kw) + subpath, kw = cachebust(rawspec, subpath, kw) break return subpath, kw |