openstack/deb-python-django-compressor
Code Issues Proposed changes

Use setdefault instead of defaultdict to be compatible with older versions of Python (<2.5).

Browse Source
This commit is contained in:
Jannis Leidel
2010-02-23 16:39:21 +01:00
parent 55acb2da06
commit 36fc377a2f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compressor/__init__.py
View File

@@ -1,5 +1,4 @@
import os import os
from collections import defaultdict
from BeautifulSoup import BeautifulSoup from BeautifulSoup import BeautifulSoup
from django import template from django import template
@@ -153,7 +152,7 @@ class CssCompressor(Compressor):
if self.split_content: if self.split_content:
return self.split_content return self.split_content
split = self.soup.findAll({'link' : True, 'style' : True}) split = self.soup.findAll({'link' : True, 'style' : True})
self.by_media = defaultdict(curry(CssCompressor, content='')) self.by_media = {}
for elem in split: for elem in split:
data = None data = None
if elem.name == 'link' and elem['rel'] == 'stylesheet': if elem.name == 'link' and elem['rel'] == 'stylesheet':
@@ -166,7 +165,8 @@ class CssCompressor(Compressor):
data = ('hunk', elem.string, elem) data = ('hunk', elem.string, elem)
if data: if data:
self.split_content.append(data) self.split_content.append(data)
self.by_media[elem.get('media', None)].split_content.append(data) self.by_media.setdefault(elem.get('media', None),
CssCompressor(content='')).split_content.append(data)
return self.split_content return self.split_content
def output(self): def output(self):