Fixed a few imports.

compressor/management/commands/compress.py

@@ -6,14 +6,13 @@ from types import MethodType
 from fnmatch import fnmatch
 from optparse import make_option
 
-from django.core.management.base import  NoArgsCommand, CommandError
+from django.core.management.base import NoArgsCommand, CommandError
 from django.template import (Context, Template,
                              TemplateDoesNotExist, TemplateSyntaxError)
 from django.utils import six
 from django.utils.datastructures import SortedDict
 from django.utils.importlib import import_module
 from django.template.loader import get_template  # noqa Leave this in to preload template locations
-from django.template.defaulttags import IfNode
 from django.template.loader_tags import (ExtendsNode, BlockNode,
                                          BLOCK_CONTEXT_KEY)
 

compressor/parser/beautifulsoup.py

@@ -1,16 +1,11 @@
 from __future__ import absolute_import
 from django.core.exceptions import ImproperlyConfigured
+from django.utils import six
+from django.utils.encoding import smart_text
 
 from compressor.exceptions import ParserError
 from compressor.parser import ParserBase
 from compressor.utils.decorators import cached_property
-from django.utils import six
-
-try:
-    from django.utils.encoding import smart_text
-except ImportError:
-    # django < 1.4.2
-    from django.utils.encoding import smart_unicode as smart_text
 
 
 class BeautifulSoupParser(ParserBase):

compressor/parser/default_htmlparser.py

@@ -1,14 +1,9 @@
 from django.utils import six
+from django.utils.encoding import smart_text
 
 from compressor.exceptions import ParserError
 from compressor.parser import ParserBase
 
-try:
-    from django.utils.encoding import smart_text
-except ImportError:
-    # django < 1.4.2
-    from django.utils.encoding import smart_unicode as smart_text
-
 
 class DefaultHtmlParser(ParserBase, six.moves.html_parser.HTMLParser):
     def __init__(self, content):

compressor/parser/html5lib.py

@@ -1,16 +1,11 @@
 from __future__ import absolute_import
 from django.core.exceptions import ImproperlyConfigured
+from django.utils.encoding import smart_text
 
 from compressor.exceptions import ParserError
 from compressor.parser import ParserBase
 from compressor.utils.decorators import cached_property
 
-try:
-    from django.utils.encoding import smart_text
-except ImportError:
-    # django < 1.4.2
-    from django.utils.encoding import smart_unicode as smart_text
-
 
 class Html5LibParser(ParserBase):
 

compressor/parser/lxml.py

@@ -1,18 +1,13 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.utils import six
 from django.core.exceptions import ImproperlyConfigured
+from django.utils import six
+from django.utils.encoding import smart_text
 
 from compressor.exceptions import ParserError
 from compressor.parser import ParserBase
 from compressor.utils.decorators import cached_property
 
-try:
-    from django.utils.encoding import smart_text
-except ImportError:
-    # django < 1.4.2
-    from django.utils.encoding import smart_unicode as smart_text
-
 
 class LxmlParser(ParserBase):
     """