From 9ab19a60f2c77b65b9cbba1f590d9986f0d18b09 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sat, 19 May 2012 20:03:59 +0200 Subject: [PATCH] Various PEP8 and pyflakes related fixes. --- compressor/base.py | 1 - compressor/cache.py | 3 ++- compressor/exceptions.py | 1 + compressor/filters/__init__.py | 2 +- compressor/filters/base.py | 2 +- compressor/filters/css_default.py | 3 +-- compressor/filters/cssmin/__init__.py | 1 + compressor/filters/cssmin/cssmin.py | 2 +- compressor/filters/jsmin/__init__.py | 3 ++- compressor/filters/jsmin/slimit.py | 2 +- compressor/filters/template.py | 2 +- compressor/js.py | 1 - compressor/management/commands/compress.py | 11 +++++++---- compressor/models.py | 2 +- compressor/parser/lxml.py | 2 +- compressor/storage.py | 2 +- 16 files changed, 22 insertions(+), 18 deletions(-) diff --git a/compressor/base.py b/compressor/base.py index 9843239..d8c3634 100644 --- a/compressor/base.py +++ b/compressor/base.py @@ -4,7 +4,6 @@ import codecs import urllib from django.core.files.base import ContentFile -from django.core.files.storage import get_storage_class from django.template import Context from django.template.loader import render_to_string from django.utils.encoding import smart_unicode diff --git a/compressor/cache.py b/compressor/cache.py index cec1015..9daad44 100644 --- a/compressor/cache.py +++ b/compressor/cache.py @@ -64,6 +64,7 @@ def get_offline_manifest_filename(): _offline_manifest = None + def get_offline_manifest(): global _offline_manifest if _offline_manifest is None: @@ -77,7 +78,7 @@ def get_offline_manifest(): def flush_offline_manifest(): global _offline_manifest - _offline_manifest = None + _offline_manifest = None def write_offline_manifest(manifest): diff --git a/compressor/exceptions.py b/compressor/exceptions.py index 407f525..e1d7273 100644 --- a/compressor/exceptions.py +++ b/compressor/exceptions.py @@ -4,6 +4,7 @@ class CompressorError(Exception): """ pass + class UncompressableFileError(Exception): """ This exception is raised when a file cannot be compressed diff --git a/compressor/filters/__init__.py b/compressor/filters/__init__.py index 96f0c87..116111f 100644 --- a/compressor/filters/__init__.py +++ b/compressor/filters/__init__.py @@ -1,2 +1,2 @@ from compressor.filters.base import (FilterBase, CallbackOutputFilter, - CompilerFilter, FilterError) + CompilerFilter, FilterError) # noqa diff --git a/compressor/filters/base.py b/compressor/filters/base.py index 7c051f6..7b53d1f 100644 --- a/compressor/filters/base.py +++ b/compressor/filters/base.py @@ -2,7 +2,7 @@ from __future__ import absolute_import import os import logging import subprocess -import tempfile + from django.core.exceptions import ImproperlyConfigured from django.core.files.temp import NamedTemporaryFile from django.utils.importlib import import_module diff --git a/compressor/filters/css_default.py b/compressor/filters/css_default.py index 12dec87..fea0898 100644 --- a/compressor/filters/css_default.py +++ b/compressor/filters/css_default.py @@ -2,8 +2,7 @@ import os import re import posixpath -from compressor.cache import (get_hexdigest, get_hashed_mtime, - get_hashed_content) +from compressor.cache import get_hashed_mtime, get_hashed_content from compressor.conf import settings from compressor.filters import FilterBase, FilterError from compressor.utils import staticfiles diff --git a/compressor/filters/cssmin/__init__.py b/compressor/filters/cssmin/__init__.py index ad20870..a71f016 100644 --- a/compressor/filters/cssmin/__init__.py +++ b/compressor/filters/cssmin/__init__.py @@ -1,5 +1,6 @@ from compressor.filters import CallbackOutputFilter + class CSSMinFilter(CallbackOutputFilter): """ A filter that utilizes Zachary Voase's Python port of diff --git a/compressor/filters/cssmin/cssmin.py b/compressor/filters/cssmin/cssmin.py index b79fc6d..3dc0cc7 100644 --- a/compressor/filters/cssmin/cssmin.py +++ b/compressor/filters/cssmin/cssmin.py @@ -32,7 +32,7 @@ try: from cStringIO import StringIO except ImportError: - from StringIO import StringIO + from StringIO import StringIO # noqa import re diff --git a/compressor/filters/jsmin/__init__.py b/compressor/filters/jsmin/__init__.py index 90cdae8..48d8007 100644 --- a/compressor/filters/jsmin/__init__.py +++ b/compressor/filters/jsmin/__init__.py @@ -1,6 +1,7 @@ from __future__ import absolute_import from compressor.filters import CallbackOutputFilter -from compressor.filters.jsmin.slimit import SlimItFilter +from compressor.filters.jsmin.slimit import SlimItFilter # noqa + class rJSMinFilter(CallbackOutputFilter): callback = "compressor.filters.jsmin.rjsmin.jsmin" diff --git a/compressor/filters/jsmin/slimit.py b/compressor/filters/jsmin/slimit.py index f53f93c..9ffc7f4 100644 --- a/compressor/filters/jsmin/slimit.py +++ b/compressor/filters/jsmin/slimit.py @@ -1,7 +1,7 @@ from __future__ import absolute_import -from django.core.exceptions import ImproperlyConfigured from compressor.filters import CallbackOutputFilter + class SlimItFilter(CallbackOutputFilter): dependencies = ["slimit"] callback = "slimit.minify" diff --git a/compressor/filters/template.py b/compressor/filters/template.py index 58a5cea..8bf7365 100644 --- a/compressor/filters/template.py +++ b/compressor/filters/template.py @@ -1,7 +1,7 @@ from django.template import Template, Context from django.conf import settings -from compressor.filters import FilterBase, FilterError +from compressor.filters import FilterBase class TemplateFilter(FilterBase): diff --git a/compressor/js.py b/compressor/js.py index 9503b17..b087804 100644 --- a/compressor/js.py +++ b/compressor/js.py @@ -1,6 +1,5 @@ from compressor.conf import settings from compressor.base import Compressor, SOURCE_HUNK, SOURCE_FILE -from compressor.exceptions import UncompressableFileError class JsCompressor(Compressor): diff --git a/compressor/management/commands/compress.py b/compressor/management/commands/compress.py index 3dc61b0..48cf34a 100644 --- a/compressor/management/commands/compress.py +++ b/compressor/management/commands/compress.py @@ -7,14 +7,14 @@ from optparse import make_option try: from cStringIO import StringIO except ImportError: - from StringIO import StringIO + from StringIO import StringIO # noqa from django.core.management.base import NoArgsCommand, CommandError from django.template import (Context, Template, TemplateDoesNotExist, TemplateSyntaxError) from django.utils.datastructures import SortedDict from django.utils.importlib import import_module -from django.template.loader import get_template # Leave this in to preload template locations +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) @@ -22,7 +22,7 @@ from django.template.loader_tags import (ExtendsNode, BlockNode, try: from django.template.loaders.cached import Loader as CachedLoader except ImportError: - CachedLoader = None + CachedLoader = None # noqa from compressor.cache import get_offline_hexdigest, write_offline_manifest from compressor.conf import settings @@ -30,6 +30,7 @@ from compressor.exceptions import OfflineGenerationError from compressor.templatetags.compress import CompressorNode from compressor.utils import walk, any + def patched_render(self, context): # 'Fake' _render method that just returns the context instead of # rendering. It also checks whether the first node is an extend node or @@ -38,6 +39,7 @@ def patched_render(self, context): self._render_firstnode(context) return context + def patched_render_firstnode(self, context): # If this template has a ExtendsNode, we want to find out what # should be put in render_context to make the {% block ... %} @@ -76,6 +78,7 @@ def patched_render_firstnode(self, context): return None return extra_context + def patched_get_parent(self, context): # Patch template returned by extendsnode's get_parent to make sure their # _render method is just returning the context instead of actually @@ -116,7 +119,7 @@ class Command(NoArgsCommand): find_template as finder_func) except ImportError: from django.template.loader import ( - find_template_source as finder_func) + find_template_source as finder_func) # noqa try: # Force django to calculate template_source_loaders from # TEMPLATE_LOADERS settings, by asking to find a dummy template diff --git a/compressor/models.py b/compressor/models.py index 5b91953..ff4f420 100644 --- a/compressor/models.py +++ b/compressor/models.py @@ -1 +1 @@ -from compressor.conf import CompressorConf +from compressor.conf import CompressorConf # noqa diff --git a/compressor/parser/lxml.py b/compressor/parser/lxml.py index 9db9ac1..6ca7f42 100644 --- a/compressor/parser/lxml.py +++ b/compressor/parser/lxml.py @@ -27,7 +27,7 @@ class LxmlParser(ParserBase): content = '%s' % self.content tree = self.fromstring(content) try: - ignore = self.tostring(tree, encoding=unicode) + self.tostring(tree, encoding=unicode) except UnicodeDecodeError: tree = self.soupparser.fromstring(content) return tree diff --git a/compressor/storage.py b/compressor/storage.py index 00adada..b4181fe 100644 --- a/compressor/storage.py +++ b/compressor/storage.py @@ -51,7 +51,7 @@ class CompressorFileStorage(FileSystemStorage): super(CompressorFileStorage, self).delete(name) except OSError, e: if e.errno != errno.ENOENT: - raise + raise compressor_file_storage = SimpleLazyObject(