Merge branch 'pipeline-next'

Conflicts:
	docs/conf.py
	setup.py

Author: cyberdelia

.travis.yml

@@ -2,6 +2,6 @@ language: python
 python:
   - 2.7
 install: pip install -q --use-mirrors tox
-script: tox -e py26-1.2.X,py27-1.2.X,py26-1.3.X,py27-1.3.X,py26,py27,docs
+script: tox
 notifications:
   irc: "irc.freenode.org#django-pipeline"

docs/conf.py

@@ -49,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2'
+version = '1.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.23'
+release = '1.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pipeline/compilers/__init__.py

@@ -1,10 +1,9 @@
+from __future__ import unicode_literals
+
 import os
 import subprocess
 
-try:
-    from staticfiles import finders
-except ImportError:
-    from django.contrib.staticfiles import finders  # noqa
+from django.contrib.staticfiles import finders
 
 from django.core.files.base import ContentFile
 from django.utils.encoding import smart_str
@@ -83,8 +82,8 @@ class CompilerError(Exception):
 class SubProcessCompiler(CompilerBase):
     def execute_command(self, command, content=None, cwd=None):
         pipe = subprocess.Popen(command, shell=True, cwd=cwd,
-            stdout=subprocess.PIPE, stdin=subprocess.PIPE,
-            stderr=subprocess.PIPE)
+                                stdout=subprocess.PIPE, stdin=subprocess.PIPE,
+                                stderr=subprocess.PIPE)
 
         if content:
             pipe.stdin.write(content)
@@ -102,6 +101,6 @@ def execute_command(self, command, content=None, cwd=None):
             raise CompilerError(error)
 
         if self.verbose:
-            print error
+            print(error)
 
         return compressed_content

pipeline/compilers/coffee.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from pipeline.conf import settings
 from pipeline.compilers import SubProcessCompiler
 

pipeline/compilers/less.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from os.path import dirname
 
 from pipeline.conf import settings

pipeline/compilers/sass.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from os.path import dirname
 
 from pipeline.conf import settings

pipeline/compilers/stylus.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from os.path import dirname
 
 from pipeline.conf import settings

pipeline/compressors/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import base64
 import os
 import posixpath
@@ -6,12 +8,7 @@
 
 from itertools import takewhile
 
-from django.utils.encoding import smart_str, force_unicode
-
-try:
-    from staticfiles import finders
-except ImportError:
-    from django.contrib.staticfiles import finders  # noqa
+from django.utils.encoding import smart_bytes, force_text
 
 from pipeline.conf import settings
 from pipeline.storage import default_storage
@@ -88,9 +85,9 @@ def compile_templates(self, paths):
         namespace = settings.PIPELINE_TEMPLATE_NAMESPACE
         base_path = self.base_path(paths)
         for path in paths:
-            contents = self.read_file(path)
-            contents = re.sub(r"\r?\n", "\\\\n", contents)
-            contents = re.sub(r"'", "\\'", contents)
+            contents = self.read_text(path)
+            contents = re.sub("\r?\n", "\\\\n", contents)
+            contents = re.sub("'", "\\'", contents)
             name = self.template_name(path, base_path)
             compiled += "%s['%s'] = %s('%s');\n" % (
                 namespace,
@@ -131,17 +128,17 @@ def reconstruct(match):
                 if asset_path.startswith("http") or asset_path.startswith("//"):
                     return "url(%s)" % asset_path
                 asset_url = self.construct_asset_path(asset_path, path,
-                    output_filename, variant)
+                                                      output_filename, variant)
                 return "url(%s)" % asset_url
-            content = self.read_file(path)
+            content = self.read_text(path)
             # content needs to be unicode to avoid explosions with non-ascii chars
-            content = re.sub(URL_DETECTOR, reconstruct, force_unicode(content))
+            content = re.sub(URL_DETECTOR, reconstruct, content)
             stylesheets.append(content)
         return '\n'.join(stylesheets)
 
     def concatenate(self, paths):
         """Concatenate together a list of files"""
-        return '\n'.join([self.read_file(path) for path in paths])
+        return "\n".join([self.read_text(path) for path in paths])
 
     def construct_asset_path(self, asset_path, css_path, output_filename, variant=None):
         """Return a rewritten asset URL for a stylesheet"""
@@ -178,7 +175,7 @@ def encoded_content(self, path):
         """Return the base64 encoded contents"""
         if path in self.__class__.asset_contents:
             return self.__class__.asset_contents[path]
-        data = self.read_file(path)
+        data = self.read_bytes(path)
         self.__class__.asset_contents[path] = base64.b64encode(data)
         return self.__class__.asset_contents[path]
 
@@ -204,13 +201,17 @@ def relative_path(self, absolute_path, output_filename):
         output_path = posixpath.join(settings.PIPELINE_ROOT, posixpath.dirname(output_filename))
         return relpath(absolute_path, output_path)
 
-    def read_file(self, path):
+    def read_bytes(self, path):
         """Read file content in binary mode"""
-        file = default_storage.open(path, 'rb')
+        file = default_storage.open(path)
         content = file.read()
         file.close()
         return content
 
+    def read_text(self, path):
+        content = self.read_bytes(path)
+        return force_text(content)
+
 
 class CompressorBase(object):
     def __init__(self, verbose):
@@ -231,11 +232,11 @@ class CompressorError(Exception):
 class SubProcessCompressor(CompressorBase):
     def execute_command(self, command, content):
         pipe = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE,
-            stdin=subprocess.PIPE, stderr=subprocess.PIPE)
+                                stdin=subprocess.PIPE, stderr=subprocess.PIPE)
 
         try:
-            pipe.stdin.write(smart_str(content))
-        except IOError, e:
+            pipe.stdin.write(smart_bytes(content))
+        except IOError as e:
             message = "Unable to pipe content to command: %s" % command
             raise CompressorError(message, e)
         pipe.stdin.close()
@@ -252,5 +253,5 @@ def execute_command(self, command, content):
             raise CompressorError(error)
 
         if self.verbose:
-            print error
+            print(error)
         return compressed_content

pipeline/compressors/closure.py

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

pipeline/compressors/cssmin.py

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

pipeline/compressors/csstidy.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.core.files import temp as tempfile
 
 from pipeline.conf import settings

pipeline/compressors/jsmin.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from pipeline.compressors import CompressorBase
 

pipeline/compressors/slimit.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from pipeline.compressors import CompressorBase
 

pipeline/compressors/uglifyjs.py

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

pipeline/compressors/yuglify.py

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

pipeline/compressors/yui.py

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

pipeline/conf/settings.py

@@ -1,11 +1,13 @@
+from __future__ import unicode_literals
+
 from django.conf import settings
 
 PIPELINE = getattr(settings, 'PIPELINE', not settings.DEBUG)
 PIPELINE_ROOT = getattr(settings, 'PIPELINE_ROOT', settings.STATIC_ROOT)
 PIPELINE_URL = getattr(settings, 'PIPELINE_URL', settings.STATIC_URL)
 
 PIPELINE_STORAGE = getattr(settings, 'PIPELINE_STORAGE',
-    'pipeline.storage.PipelineFinderStorage')
+                           'pipeline.storage.PipelineFinderStorage')
 
 PIPELINE_CSS_COMPRESSOR = getattr(settings, 'PIPELINE_CSS_COMPRESSOR',
                                   'pipeline.compressors.yuglify.YuglifyCompressor')

pipeline/glob.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import os
 import re
 import fnmatch

pipeline/jinja2/ext.py

@@ -1,13 +1,9 @@
-import inspect
+from __future__ import unicode_literals
 
-try:
-    from staticfiles.storage import staticfiles_storage
-except ImportError:
-    from django.contrib.staticfiles.storage import staticfiles_storage  # noqa
+from django.contrib.staticfiles.storage import staticfiles_storage
 
-from django.conf import settings as django_settings
+from django.conf import settings
 from jinja2 import Environment, FileSystemLoader
-from pipeline.conf import settings as pipeline_settings
 from pipeline.packager import Packager, PackageNotFound
 from pipeline.utils import guess_type
 
@@ -19,44 +15,13 @@ def __init__(self, package_type):
             raise PackageNotFound("Package type must be css or js, supplied %s" % package_type)
         self.package_type = package_type
         self.loader = FileSystemLoader((app_directories.app_template_dirs +
-            django_settings.TEMPLATE_DIRS))
-        self.get_pipeline_settings()
-
-    def get_pipeline_settings(self):
-        """
-        Because extra Jinja2 functions have to be declared
-        at creation time the new functions have to be declared before
-        django settings evaluation so when pipeline tries to import django
-        settings it will get the default globals rather than user defined
-        settings. This function attempts to fudge back in user defined
-        settings into pipeline settings as django.conf.settings is lazy
-        loaded and pipeline settings are not.
-
-        No harm intended :)
-
-        I guess a better more robust solution would be to make pipeline
-        settings lazy loaded also.
-        """
-        members = inspect.getmembers(pipeline_settings)
-        for setting, val in members:
-            if setting.startswith('PIPELINE'):
-                if hasattr(django_settings, setting):
-                    val = getattr(django_settings, setting)
-                else:
-                    if type(getattr(pipeline_settings, setting)) == str:
-                        val = "'%s'" % val
-                val = val if val else "''"
-                expr = "pipeline_settings.%s = %s" % (setting, val)
-                exec expr
-            pipeline_settings.PIPELINE = getattr(django_settings,
-                    'PIPELINE', not django_settings.DEBUG)
-        self.settings = pipeline_settings
+                                        settings.TEMPLATE_DIRS))
 
     def get_package(self, name):
         """Get the js or css package."""
         package = {
-            'js': self.settings.PIPELINE_JS.get(name, {}),
-            'css': self.settings.PIPELINE_CSS.get(name, {}),
+            'js': settings.PIPELINE_JS.get(name, {}),
+            'css': settings.PIPELINE_CSS.get(name, {}),
         }[self.package_type]
 
         if package:
@@ -101,7 +66,7 @@ def html(self, name):
         """Render the HTML Snippet"""
         self.get_package(name)
         if self.package:
-            if self.settings.PIPELINE:
+            if settings.PIPELINE:
                 return self.render(self.package.output_filename)
             else:
                 paths = self.packager.compile(self.package.paths)
@@ -127,7 +92,7 @@ def render_individual_js(self, paths, templates=None):
 
     def render_inline_js(self, package, js):
         template_name = (self.package.template_name or
-                "pipeline/inline_js.jinja")
+                         "pipeline/inline_js.jinja")
         context = self.package.extra_context
         context.update({
             'source': js

pipeline/manifest.py

@@ -1,9 +1,8 @@
+from __future__ import unicode_literals
+
 import os
 
-try:
-    from staticfiles.finders import get_finders
-except ImportError:
-    from django.contrib.staticfiles.finders import get_finders  # noqa
+from django.contrib.staticfiles.finders import get_finders
 
 from pipeline.conf import settings
 

pipeline/middleware.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.utils.encoding import DjangoUnicodeDecodeError
 from django.utils.html import strip_spaces_between_tags as minify_html
 

pipeline/packager.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.core.files.base import ContentFile
 from django.utils.encoding import smart_str
 
@@ -28,12 +30,12 @@ def sources(self):
     @property
     def paths(self):
         return [path for path in self.sources
-            if not path.endswith(settings.PIPELINE_TEMPLATE_EXT)]
+                if not path.endswith(settings.PIPELINE_TEMPLATE_EXT)]
 
     @property
     def templates(self):
         return [path for path in self.sources
-            if path.endswith(settings.PIPELINE_TEMPLATE_EXT)]
+                if path.endswith(settings.PIPELINE_TEMPLATE_EXT)]
 
     @property
     def output_filename(self):
@@ -86,16 +88,16 @@ def individual_url(self, filename):
 
     def pack_stylesheets(self, package, **kwargs):
         return self.pack(package, self.compressor.compress_css, css_compressed,
-            output_filename=package.output_filename,
-            variant=package.variant, **kwargs)
+                         output_filename=package.output_filename,
+                         variant=package.variant, **kwargs)
 
     def compile(self, paths, force=False):
         return self.compiler.compile(paths, force=force)
 
     def pack(self, package, compress, signal, **kwargs):
         output_filename = package.output_filename
         if self.verbose:
-            print "Saving: %s" % output_filename
+            print("Saving: %s" % output_filename)
         paths = self.compile(package.paths, force=True)
         content = compress(paths, **kwargs)
         self.save_file(output_filename, content)