diff -r 697a8181ba30 -r ce338133c92c web/webconfig.py --- a/web/webconfig.py Mon Aug 26 16:14:09 2013 +0200 +++ b/web/webconfig.py Mon Aug 26 16:15:29 2013 +0200 @@ -401,7 +401,7 @@ self._load_ui_properties_file(uiprops, path) self._load_ui_properties_file(uiprops, self.apphome) datadir_url = uiprops.context['datadir_url'] - # XXX pre 3.9 css compat + # pre 3.9 css compat, however the old css still rules if self['use-old-css']: if (datadir_url+'/cubicweb.css') in uiprops['STYLESHEETS']: idx = uiprops['STYLESHEETS'].index(datadir_url+'/cubicweb.css') @@ -413,21 +413,6 @@ uiprops['JAVASCRIPTS'].insert(0, cubicweb_js_url) def _load_ui_properties_file(self, uiprops, path): - resourcesfile = join(path, 'data', 'external_resources') - if exists(resourcesfile): - warn('[3.9] %s file is deprecated, use an uiprops.py file' - % resourcesfile, DeprecationWarning) - datadir_url = uiprops.context['datadir_url'] - for rid, val in read_config(resourcesfile).iteritems(): - if rid in ('STYLESHEETS', 'STYLESHEETS_PRINT', - 'IE_STYLESHEETS', 'JAVASCRIPTS'): - val = [w.strip().replace('DATADIR', datadir_url) - for w in val.split(',') if w.strip()] - if rid == 'IE_STYLESHEETS': - rid = 'STYLESHEETS_IE' - else: - val = val.strip().replace('DATADIR', datadir_url) - uiprops[rid] = val uipropsfile = join(path, 'uiprops.py') if exists(uipropsfile): self.debug('loading %s', uipropsfile)