From a6665bb179e30caf89fcf496af60da68beedef94 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Mon, 27 May 2013 11:30:09 +0200
Subject: [PATCH] Fixed a few imports.

---
 compressor/management/commands/compress.py | 3 +--
 compressor/parser/beautifulsoup.py         | 9 ++-------
 compressor/parser/default_htmlparser.py    | 7 +------
 compressor/parser/html5lib.py              | 7 +------
 compressor/parser/lxml.py                  | 9 ++-------
 5 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/compressor/management/commands/compress.py b/compressor/management/commands/compress.py
index 017c042..c106e63 100644
--- a/compressor/management/commands/compress.py
+++ b/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)
 
diff --git a/compressor/parser/beautifulsoup.py b/compressor/parser/beautifulsoup.py
index bddd39a..d143df4 100644
--- a/compressor/parser/beautifulsoup.py
+++ b/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):
diff --git a/compressor/parser/default_htmlparser.py b/compressor/parser/default_htmlparser.py
index f3b5b89..80272cb 100644
--- a/compressor/parser/default_htmlparser.py
+++ b/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):
diff --git a/compressor/parser/html5lib.py b/compressor/parser/html5lib.py
index eb0d28f..b1d0948 100644
--- a/compressor/parser/html5lib.py
+++ b/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):
 
diff --git a/compressor/parser/lxml.py b/compressor/parser/lxml.py
index c0599aa..d982ee2 100644
--- a/compressor/parser/lxml.py
+++ b/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):
     """