Fix test for Travis environements

Author: TheBuky

HISTORY.rst

@@ -14,14 +14,9 @@ History
 * Remove of old imports form 'django.utils.six' and these fixes (1.7.0).
 * Remove tests of uncovered versions of Python and Django.
 * Replace tests for Pypy by Pypy3.
-* Explicitly specify when files are read / writ in binary mode.
-* Deal with universal newlines of Python 3 for tests. When opening a file
-  as binary mode '\r\n' is used as linebreak instead of '\n'. Open file in
-  text mode for tests to let OS correctly interpret line breaks and remove
-  'smart_bytes' not anymore used.
-* Add method to simulate file reading for tests to correctly interpret
-  line breaks from given string.
-* Upgrade documentation version to 2.0.
+* Explicitly specify when files are read / write in binary mode.
+* Set opening files for tests  to deal with universal newlines.
+* Upgrade documentation version to 2.0 to follow the project version.
 
 1.7.0
 =====

pipeline/collector.py

@@ -6,7 +6,6 @@
 from django.contrib.staticfiles import finders
 from django.contrib.staticfiles.storage import staticfiles_storage
 
-
 from pipeline.finders import PipelineFinder
 
 

pipeline/compressors/__init__.py

@@ -137,15 +137,15 @@ def reconstruct(match):
             # content needs to be unicode to avoid explosions with non-ascii chars
             content = re.sub(URL_DETECTOR, reconstruct, content)
             stylesheets.append(content)
-        return '\r\n'.join(stylesheets)
+        return '\n'.join(stylesheets)
 
     def concatenate(self, paths):
         """Concatenate together a list of files"""
         # Note how a semicolon is added between the two files to make sure that
-        # their behavior is not changed. '(expression1)\n\r(expression2)' calls
+        # their behavior is not changed. '(expression1)\n(expression2)' calls
         # `expression1` with `expression2` as an argument! Superfluos semicolons
         # are valid in JavaScript and will be removed by the minifier.
-        return "\r\n;".join([self.read_text(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"""

pipeline/compressors/yui.py

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

pipeline/jinja2/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from jinja2 import nodes, TemplateSyntaxError
 from jinja2.ext import Extension
 

tests/tests/test_compressor.py

@@ -31,12 +31,6 @@ def setUp(self):
         self.compressor = Compressor()
         default_collector.collect()
 
-    @staticmethod
-    def emulate_file_reading(text):
-        with io.StringIO(text, newline='\r\n') as f:
-            data = f.read()
-        return data
-
     def test_js_compressor_class(self):
         self.assertEqual(self.compressor.js_compressor, YuglifyCompressor)
 
@@ -49,15 +43,15 @@ def test_concatenate_and_rewrite(self):
             _('pipeline/css/second.css')
         ], 'css/screen.css')
         expected = """.concat {\n  display: none;\n}\n\n.concatenate {\n  display: block;\n}\n"""
-        self.assertEqual(self.emulate_file_reading(expected), css)
+        self.assertEqual(expected, css)
 
     def test_concatenate(self):
         js = self.compressor.concatenate([
             _('pipeline/js/first.js'),
             _('pipeline/js/second.js')
         ])
         expected = """(function() {\n  window.concat = function() {\n    console.log(arguments);\n  }\n}()) // No semicolon\n\n;(function() {\n  window.cat = function() {\n    console.log("hello world");\n  }\n}());\n"""
-        self.assertEqual(self.emulate_file_reading(expected), js)
+        self.assertEqual(expected, js)
 
     @patch.object(base64, 'b64encode')
     def test_encoded_content(self, mock):
@@ -142,7 +136,7 @@ def test_url_rewrite(self):
         output = self.compressor.concatenate_and_rewrite([
             _('pipeline/css/urls.css'),
         ], 'css/screen.css')
-        expected = """.embedded-url-svg {
+        self.assertEqual(""".embedded-url-svg {
   background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath      stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%     3C/svg%3E");
 }
 @font-face {
@@ -172,21 +166,19 @@ def test_url_rewrite(self):
   background-image: url(#image-gradient);
 }
 @font-face{src:url(../pipeline/fonts/pipeline.eot);src:url(../pipeline/fonts/pipeline.eot?#iefix) format('embedded-opentype'),url(../pipeline/fonts/pipeline.woff) format('woff'),url(../pipeline/fonts/pipeline.ttf) format('truetype');}
-"""
-        self.assertEqual(self.emulate_file_reading(expected), output)
+""", output)
 
     def test_url_rewrite_data_uri(self):
         output = self.compressor.concatenate_and_rewrite([
             _('pipeline/css/nested/nested.css'),
         ], 'pipeline/screen.css')
-        expected = """.data-url {
+        self.assertEqual(""".data-url {
   background-image: url(data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2212px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2012%2014%22%20style%3D%22enable-background%3Anew%200%200%2012%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M11%2C6V5c0-2.762-2.239-5-5-5S1%2C2.238%2C1%2C5v1H0v8h12V6H11z%20M6.5%2C9.847V12h-1V9.847C5.207%2C9.673%2C5%2C9.366%2C5%2C9%20c0-0.553%2C0.448-1%2C1-1s1%2C0.447%2C1%2C1C7%2C9.366%2C6.793%2C9.673%2C6.5%2C9.847z%20M9%2C6H3V5c0-1.657%2C1.343-3%2C3-3s3%2C1.343%2C3%2C3V6z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E);
 }
 .data-url-quoted {
   background-image: url('data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2212px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2012%2014%22%20style%3D%22enable-background%3Anew%200%200%2012%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M11%2C6V5c0-2.762-2.239-5-5-5S1%2C2.238%2C1%2C5v1H0v8h12V6H11z%20M6.5%2C9.847V12h-1V9.847C5.207%2C9.673%2C5%2C9.366%2C5%2C9%20c0-0.553%2C0.448-1%2C1-1s1%2C0.447%2C1%2C1C7%2C9.366%2C6.793%2C9.673%2C6.5%2C9.847z%20M9%2C6H3V5c0-1.657%2C1.343-3%2C3-3s3%2C1.343%2C3%2C3V6z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E');
 }
-"""
-        self.assertEqual(self.emulate_file_reading(expected), output)
+""", output)
 
     @skipIf(sys.platform.startswith("win"), "requires posix platform")
     def test_compressor_subprocess_unicode(self):

tests/tests/test_middleware.py

@@ -1,7 +1,5 @@
-try:
-    from mock import patch
-except ImportError:
-    from unittest.mock import patch  # noqa
+
+from unittest.mock import patch
 
 from django.core.exceptions import MiddlewareNotUsed
 from django.test import TestCase