Upgrade syntax to Python 3 using pyupgrade (#787)

Author: peymanslh

docs/conf.py

@@ -37,8 +37,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'django-pipeline'
-copyright = u'2011-2014, Timothée Peignier'
+project = 'django-pipeline'
+copyright = '2011-2014, Timothée Peignier'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -175,8 +175,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'django-pipeline.tex', u'Pipeline Documentation',
-   u'Timothée Peignier', 'manual'),
+  ('index', 'django-pipeline.tex', 'Pipeline Documentation',
+   'Timothée Peignier', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -208,6 +208,6 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'django-pipeline', u'Pipeline Documentation',
-     [u'Timothée Peignier'], 1)
+    ('index', 'django-pipeline', 'Pipeline Documentation',
+     ['Timothée Peignier'], 1)
 ]

pipeline/collector.py

@@ -8,7 +8,7 @@
 from pipeline.finders import PipelineFinder
 
 
-class Collector(object):
+class Collector:
     request = None
 
     def __init__(self, storage=None):

pipeline/compilers/__init__.py

@@ -13,7 +13,7 @@
 from pipeline.utils import set_std_streams_blocking, to_class
 
 
-class Compiler(object):
+class Compiler:
     def __init__(self, storage=None, verbose=False):
         if storage is None:
             storage = staticfiles_storage
@@ -56,7 +56,7 @@ def _compile(input_path):
                 return list(executor.map(_compile, paths))
 
 
-class CompilerBase(object):
+class CompilerBase:
     def __init__(self, verbose, storage):
         self.verbose = verbose
         self.storage = storage

pipeline/compressors/__init__.py

@@ -34,7 +34,7 @@
 FONT_EXTS = ['.ttf', '.otf', '.woff']
 
 
-class Compressor(object):
+class Compressor:
     asset_contents = {}
 
     def __init__(self, storage=None, verbose=False):
@@ -90,7 +90,7 @@ def compile_templates(self, paths):
             contents = re.sub("\r?\n", "\\\\n", contents)
             contents = re.sub("'", "\\'", contents)
             name = self.template_name(path, base_path)
-            compiled.append("%s['%s'] = %s('%s');\n" % (
+            compiled.append("{}['{}'] = {}('{}');\n".format(
                 namespace,
                 name,
                 settings.TEMPLATE_FUNC,
@@ -101,7 +101,7 @@ def compile_templates(self, paths):
         else:
             compiler = ""
         return "\n".join([
-            "%(namespace)s = %(namespace)s || {};" % {'namespace': namespace},
+            "{namespace} = {namespace} || {{}};".format(namespace=namespace),
             compiler,
             ''.join(compiled)
         ])
@@ -118,7 +118,7 @@ def template_name(self, path, base):
             path = os.path.basename(path)
         if path == base:
             base = os.path.dirname(path)
-        name = re.sub(r"^%s[\/\\]?(.*)%s$" % (
+        name = re.sub(r"^{}[\/\\]?(.*){}$".format(
             re.escape(base), re.escape(settings.TEMPLATE_EXT)
         ), r"\1", path)
         return re.sub(r"[\/\\]", settings.TEMPLATE_SEPARATOR, name)
@@ -228,7 +228,7 @@ def read_text(self, path):
         return force_str(content)
 
 
-class CompressorBase(object):
+class CompressorBase:
     def __init__(self, verbose):
         self.verbose = verbose
 

pipeline/compressors/terser.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from pipeline.compressors import SubProcessCompressor
 from pipeline.conf import settings
 

pipeline/exceptions.py

@@ -1,5 +1,3 @@
-
-
 class PipelineException(Exception):
     pass
 
@@ -10,7 +8,7 @@ class PackageNotFound(PipelineException):
 
 class CompilerError(PipelineException):
     def __init__(self, msg, command=None, error_output=None):
-        super(CompilerError, self).__init__(msg)
+        super().__init__(msg)
 
         self.command = command
         self.error_output = error_output.strip()

pipeline/finders.py

@@ -18,7 +18,7 @@ class PipelineFinder(BaseStorageFinder):
 
     def find(self, path, all=False):
         if not settings.PIPELINE_ENABLED:
-            return super(PipelineFinder, self).find(path, all)
+            return super().find(path, all)
         else:
             return []
 
@@ -60,7 +60,7 @@ def list(self, *args):
         return []
 
 
-class PatternFilterMixin(object):
+class PatternFilterMixin:
     ignore_patterns = []
 
     def get_ignored_patterns(self):
@@ -69,7 +69,7 @@ def get_ignored_patterns(self):
     def list(self, ignore_patterns):
         if ignore_patterns:
             ignore_patterns = ignore_patterns + self.get_ignored_patterns()
-        return super(PatternFilterMixin, self).list(ignore_patterns)
+        return super().list(ignore_patterns)
 
 
 class AppDirectoriesFinder(PatternFilterMixin, DjangoAppDirectoriesFinder):

pipeline/forms.py

@@ -8,7 +8,7 @@
 from .packager import Packager
 
 
-class PipelineFormMediaProperty(object):
+class PipelineFormMediaProperty:
     """A property that converts Pipeline packages to lists of files.
 
     This is used behind the scenes for any Media classes that subclass
@@ -122,7 +122,7 @@ def __new__(cls, name, bases, attrs):
             type:
             The new class.
         """
-        new_class = super(PipelineFormMediaMetaClass, cls).__new__(
+        new_class = super().__new__(
             cls, name, bases, attrs)
 
         # If we define any packages, we'll need to use our special
@@ -158,15 +158,15 @@ def _get_css_files(cls, extra_files):
         packager = Packager()
         css_packages = getattr(cls, 'css_packages', {})
 
-        return dict(
-            (media_target,
-             cls._get_media_files(packager=packager,
-                                  media_packages=media_packages,
-                                  media_type='css',
-                                  extra_files=extra_files.get(media_target,
-                                                              [])))
+        return {
+            media_target: cls._get_media_files(
+                packager=packager,
+                media_packages=media_packages,
+                media_type='css',
+                extra_files=extra_files.get(media_target, []),
+            )
             for media_target, media_packages in css_packages.items()
-        )
+        }
 
     def _get_js_files(cls, extra_files):
         """Return all JavaScript files from the Media class.
@@ -229,7 +229,7 @@ def _get_media_files(cls, packager, media_packages, media_type,
         return source_files
 
 
-class PipelineFormMedia(object, metaclass=PipelineFormMediaMetaClass):
+class PipelineFormMedia(metaclass=PipelineFormMediaMetaClass):
     """Base class for form or widget Media classes that use Pipeline packages.
 
     Forms or widgets that need custom CSS or JavaScript media on a page can

pipeline/jinja2/__init__.py

@@ -8,7 +8,7 @@
 
 
 class PipelineExtension(PipelineMixin, Extension):
-    tags = set(['stylesheet', 'javascript'])
+    tags = {'stylesheet', 'javascript'}
 
     def parse(self, parser):
         tag = next(parser.stream)

pipeline/middleware.py

@@ -8,7 +8,7 @@
 
 class MinifyHTMLMiddleware(MiddlewareMixin):
     def __init__(self, *args, **kwargs):
-        super(MinifyHTMLMiddleware, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         if not settings.PIPELINE_ENABLED:
             raise MiddlewareNotUsed