Merge ~bryce/ubuntu/+source/convoy:convoy-fix-x-focal into ubuntu/+source/convoy:debian/sid

[Bryce Harrington]

Drops py2 support for convoy, in order to resolve proposed migration block.

python3-django-maas still depends on the py3 binary package, but nothing depends on the py2 binary package.

The autopkgtest for this package ran only against python2 and required python-mocker, which has no python3 equivalent. However, running the tests manually I found it worked fine with python3 and didn't complain about python-mocker.

The package's compat level is old (as are a few other aspects of the package, like use of bzr, etc.) due to that it's not been actively maintained in quite some time. I opted to keep changes to a minimum though, and only changed what was required to get it building without py2. If you think more extensive updating is warranted let me know.

A PPA with the package is here:
    https://launchpad.net/~bryce/+archive/ubuntu/convoy-fix-x

[Bryce Harrington (bryce)]

Btw, launchpad seems to be including the changes from 0.2.1+bzr39-1 for some reason. Here is a more minimal debdiff:

http://paste.ubuntu.com/p/r2Qff7zzwb/

[Christian Ehrhardt  (paelzer)]

For the diff I think the merge target would need to be focal-devel instead of debian/sid.
But it can be reviewed as-is.

[Christian Ehrhardt  (paelzer)]

Ack that there is no reverse depends on python-convoy
Ack to the general changes
Nit Picks:
- changelog doesn't mention e.g. d/rules changes for --buildsystem=pybuild
- maybe split the long paragraph in sub-bullets prefixed by the files the chagne takes place

All of the above is style and you could even say "nah I like mine better".
+1 to the actual functional changes.

[Christian Ehrhardt  (paelzer)]

I ran the updated packages .dsc through autopkgtest against the PPA
The result seem to need some test/polishing

$ sudo ~/work/autopkgtest/autopkgtest/runner/autopkgtest --no-built-binaries --apt-upgrade --setup-commands="add-apt-repository ppa:bryce/convoy-fix-x; apt update; apt -y upgrade" --shell-fail convoy_0.2.1+bzr39-1ubuntu1~focal2.dsc -- qemu --qemu-options='-cpu host' --ram-size=2048 --cpus 2 ~/work/autopkgtest-focal-amd64.img
[...]
autopkgtest [07:46:57]: test testsuite: [-----------------------
+ python3 -m unittest discover convoy/tests
E.....................
======================================================================
ERROR: test_combo (unittest.loader._FailedTest)
----------------------------------------------------------------------
ImportError: Failed to import test module: test_combo
Traceback (most recent call last):
  File "/usr/lib/python3.7/unittest/loader.py", line 436, in _find_test_path
    module = self._get_module_from_name(name)
  File "/usr/lib/python3.7/unittest/loader.py", line 377, in _get_module_from_name
    __import__(name)
  File "/tmp/autopkgtest.UK17Pb/build.Oap/src/convoy/tests/test_combo.py", line 22, in <module>
    from webtest import TestApp
ModuleNotFoundError: No module named 'webtest'

----------------------------------------------------------------------
Ran 22 tests in 0.032s

FAILED (errors=1)

I'd not want to upload as-is - did you run the tests on your side and they were ok?

review: Needs Fixing

[Bryce Harrington (bryce)]

doko beat us to the upload:

https://launchpad.net/ubuntu/+source/convoy/0.2.1+bzr39-1ubuntu3

Unmerged commits

0e08aeb... by Bryce Harrington on 2020-01-08

  * Drop python2 package in favor of python3.
    - Change autopkgtest to use python3 dependencies. Drop dependence on
      python-mocker since there's no py3 version of it; the testsuite
      doesn't appear to need it when run under python3.

6fbd26b... by Bryce Harrington on 2020-01-08

changelog

b614438... by Matthias Klose on 2019-12-17

Import patches-unapplied version 0.2.1+bzr39-1build1 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: da3a596fb204f35ce1fe367b1ebdaf6ce4e81a23

New changelog entries:
  * No-change rebuild to generate dependencies on python2.

da3a596... by Andres Rodriguez on 2015-11-12

Import patches-unapplied version 0.2.1+bzr39-1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: b9b26230def71a3b0ad1c83a2a3c624cbec0edc2

New changelog entries:
  * New upstream snapshot.
  * Build with python3.

diff --git a/Makefile b/Makefile
index e9a4e00..b322f5b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,33 @@
-PY=$(shell which python)
+PYTHON := python
 
-.PHONY: test
-test:
-	$(PY) setup.py test
+# ---
 
-.PHONY: build
-build:
-	$(PY) setup.py sdist
+dist: bin/python setup.py README
+	bin/python setup.py egg_info sdist
 
-.PHONY: upload
-upload:
-	$(PY) setup.py sdist upload
+upload: bin/python setup.py README
+	bin/python setup.py egg_info sdist upload
+
+test: bin/tox
+	@bin/tox
+
+clean:
+	$(RM) -r bin build dist include lib local TAGS tags
+	find . -name '*.py[co]' -print0 | xargs -r0 $(RM)
+	find . -name '__pycache__' -print0 | xargs -r0 $(RM) -r
+	find . -name '*.egg' -print0 | xargs -r0 $(RM) -r
+	find . -name '*.egg-info' -print0 | xargs -r0 $(RM) -r
+	find . -name '*~' -print0 | xargs -r0 $(RM)
+	$(RM) -r .eggs .tox _trial_temp
+
+# ---
+
+bin/tox: bin/pip
+	bin/pip install --quiet --ignore-installed tox
+
+bin/python bin/pip:
+	virtualenv --python=$(PYTHON) --quiet $(CURDIR)
+
+# ---
+
+.PHONY: dist upload test clean
diff --git a/convoy/combo.py b/convoy/combo.py
index da27dd3..664f4d9 100644
--- a/convoy/combo.py
+++ b/convoy/combo.py
@@ -1,5 +1,5 @@
 #   Convoy is a WSGI app for loading multiple files in the same request.
-#   Copyright (C) 2010-2012  Canonical, Ltd.
+#   Copyright (C) 2011-2015 Canonical, Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as
@@ -15,15 +15,25 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import cgi
-import os
+import logging
+import os.path
 import re
-import urlparse
+import sys
+
+try:
+    from urllib.parse import parse_qsl
+except ImportError:
+    from cgi import parse_qsl
+
+try:
+    import urllib.parse as urlparse
+except ImportError:
+    import urlparse
 
 
 CHUNK_SIZE = 2 << 12
-URL_RE = re.compile("url\([ \"\']*([^ \"\']+)[ \"\']*\)")
-URL_PARSE = re.compile("/([^/]*).*?$")
+URL_RE = re.compile(b"""url[(][ "']*([^ "')]+)[ "']*[)]""")
+URL_PARSE = re.compile(b"/([^/]*).*?$")
 
 
 def relative_path(from_file, to_file):
@@ -50,10 +60,27 @@ def parse_qs(query):
 
     Returns the list of arguments in the original order.
     """
-    params = cgi.parse_qsl(query, keep_blank_values=True)
+    params = parse_qsl(query, keep_blank_values=True)
     return tuple([param for param, value in params])
 
 
+class InvalidFileError(Exception):
+    """Exception raised for bogus filenames."""
+
+
+def validate_files(fnames, root):
+    """Validate that the given filenames are sane.
+
+    Filenames must be within the root directory and actual files.
+
+    @raises InvalidFileError for any bogus files.
+    """
+    for fname in fnames:
+        full = os.path.abspath(os.path.join(root, fname))
+        if not (full.startswith(root) and os.path.isfile(full)):
+            raise InvalidFileError(fname)
+
+
 def combine_files(fnames, root, resource_prefix="", rewrite_urls=True):
     """Combine many files into one.
 
@@ -61,59 +88,77 @@ def combine_files(fnames, root, resource_prefix="", rewrite_urls=True):
     files. The relative path to root will be included as a comment
     between each file.
     """
+    # Used when encoding local file-system paths.
+    fsenc = sys.getfilesystemencoding()
+
+    if not isinstance(root, bytes):
+        # This is a local file-system path.
+        root = root.encode(fsenc)
+    if not isinstance(resource_prefix, bytes):
+        # This is a URL component, so assume only ASCII is okay.
+        resource_prefix = resource_prefix.encode("ascii")
+
+    resource_prefix = resource_prefix.rstrip(b"/")
 
-    resource_prefix = resource_prefix.rstrip("/")
     for fname in fnames:
+        if not isinstance(fname, bytes):
+            # This is a local file-system path.
+            fname = fname.encode(fsenc)
+
         file_ext = os.path.splitext(fname)[-1]
         basename = os.path.basename(fname)
         full = os.path.abspath(os.path.join(root, fname))
-        yield "/* " + fname + " */\n"
-        if not full.startswith(root) or not os.path.exists(full):
-            yield "/* [missing] */\n"
-        else:
-            with open(full, "r") as f:
-                if file_ext == ".css" and rewrite_urls:
+        if (full.startswith(root) and os.path.isfile(full)):
+            yield b"/* " + fname + b" */\n"
+            with open(full, "rb") as f:
+                if file_ext == b".css" and rewrite_urls:
                     file_content = f.read()
                     src_dir = os.path.dirname(full)
                     relative_parts = relative_path(
                         os.path.join(root, basename), src_dir).split(
-                        os.path.sep)
+                        os.path.sep.encode(fsenc))
 
                     def fix_relative_url(match):
                         url = match.group(1)
                         # Don't modify absolute URLs or 'data:' urls.
-                        if (url.startswith("http") or
-                            url.startswith("/") or
-                            url.startswith("data:")):
+                        if (url.startswith(b"http") or
+                                url.startswith(b"/") or
+                                url.startswith(b"data:")):
                             return match.group(0)
-                        parts = relative_parts + url.split("/")
+                        parts = relative_parts + url.split(b"/")
                         result = []
                         for part in parts:
-                            if part == ".." and result and result[-1] != "..":
+                            if part == b".." and result[-1:] != [b".."]:
                                 result.pop(-1)
                                 continue
                             result.append(part)
-                        return "url(%s)" % "/".join(
-                            filter(None, [resource_prefix] + result))
+                        return b"url(x)".replace(b"x", b"/".join(
+                            part for part in [resource_prefix] + result
+                            if part))
+
                     file_content = URL_RE.sub(fix_relative_url, file_content)
                     yield file_content
-                    yield "\n"
+                    yield b"\n"
                 else:
                     while True:
                         chunk = f.read(CHUNK_SIZE)
                         if not chunk:
-                            yield "\n"
+                            yield b"\n"
                             break
                         yield chunk
 
 
-def combo_app(root, resource_prefix="", rewrite_urls=True):
+def combo_app(
+        root, resource_prefix="", rewrite_urls=True, additional_headers=None):
     """A simple YUI Combo Service WSGI app.
 
     Serves any files under C{root}, setting an appropriate
     C{Content-Type} header.
+    Additional headers can be provided as a list of tuples to allow
+    for generic extensions, but their correctness won't be verified.
     """
     root = os.path.abspath(root)
+    log = logging.getLogger(__name__)
 
     def app(environ, start_response, root=root):
         # Path hint uses the rest of the url to map to files on disk based off
@@ -127,8 +172,9 @@ def combo_app(root, resource_prefix="", rewrite_urls=True):
             elif fnames[0].endswith(".css"):
                 content_type = "text/css"
         else:
+            log.info('No files in querystring.')
             start_response("404 Not Found", [("Content-Type", content_type)])
-            return ("Not Found",)
+            return (b"Not Found",)
 
         # Take any prefix in the url route into consideration for the root to
         # find files.
@@ -136,12 +182,21 @@ def combo_app(root, resource_prefix="", rewrite_urls=True):
         # Enforce that the updated root is not outside the original root.
         absroot = os.path.abspath(updated_root)
         if not absroot.startswith(os.path.abspath(root)):
+            log.info('Updated root is outside of original root.')
             start_response("400 Bad Request", [("Content-Type", content_type)])
-            return ("Bad Request",)
+            return (b"Bad Request",)
+        headers = [("Content-Type", content_type),
+                   ("X-Content-Type-Options", "nosniff")]
+        if additional_headers is not None:
+            headers.extend(additional_headers)
+        try:
+            validate_files(fnames, updated_root)
+        except InvalidFileError as if_error:
+            log.info('No such file: %s' % if_error.args[0])
+            start_response("400 Bad Request", headers)
+            return (b"Bad Request",)
         else:
-            start_response("200 OK", [("Content-Type", content_type),
-                                      ("X-Content-Type-Options", "nosniff")])
-
-        return combine_files(fnames, updated_root, resource_prefix,
-                             rewrite_urls=rewrite_urls)
+            start_response("200 OK", headers)
+            return combine_files(fnames, updated_root, resource_prefix,
+                                 rewrite_urls=rewrite_urls)
     return app
diff --git a/convoy/meta.py b/convoy/meta.py
index ed9f3ed..d38c2c7 100644
--- a/convoy/meta.py
+++ b/convoy/meta.py
@@ -1,5 +1,5 @@
 #   Convoy is a WSGI app for loading multiple files in the same request.
-#   Copyright (C) 2010-2012  Canonical, Ltd.
+#   Copyright (C) 2011-2015 Canonical, Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as
@@ -35,6 +35,7 @@ DETAILS_REPLACE = r'"\1":'
 
 LITERAL_RE = re.compile("([\[ ]+)\"([\w\.\+-]+)\"([^:])")
 NAME_RE = re.compile("[\.\+-]")
+COMMENT_RE = re.compile("\/\/.*")
 
 
 def extract_metadata(src):
@@ -44,6 +45,7 @@ def extract_metadata(src):
         name, details, ignore = entry.groups()
         details = details.replace('\'', '"')
         details = DETAILS_FIND.sub(DETAILS_REPLACE, details)
+        details = COMMENT_RE.sub('', details)
         details = json.loads(details)
         details["name"] = name
         metadata.append(details)
@@ -100,7 +102,8 @@ class Builder:
 
         for fname in fnames:
             self.log("Extracting metadata from '%s'" % fname)
-            data = open(fname, "r").read()
+            with open(fname, "r") as fd:
+                data = fd.read()
             meta = extract_metadata(data)
             prefix = ""
             if self.prefix and not prefix.endswith("/"):
@@ -167,13 +170,12 @@ class Builder:
                 return match.group(1) + literals_map[literal] + match.group(3)
             return match.group(0)
 
-
         linebreak = ",\n  "
         variables_decl = "var SKIN_SAM_PREFIX = 'skin-sam-'" + linebreak
         if self.prefix:
-             variables_decl += "PREFIX = '%s'%s" % (self.prefix, linebreak)
+            variables_decl += "PREFIX = '%s'%s" % (self.prefix, linebreak)
         extra_variables = []
-        for literal, variable in sorted(literals_map.iteritems()):
+        for literal, variable in sorted(literals_map.items()):
             extra_variable = "%s = %s" % (
                 variable, ('"%s"' % literal).replace(
                     '"skin-sam-', 'SKIN_SAM_PREFIX + "'))
@@ -202,11 +204,11 @@ class Builder:
              "after_list"])
 
         modules_decl = []
-        for module_name, module_info in sorted(modules.iteritems()):
+        for module_name, module_info in sorted(modules.items()):
             module_decl = [
                 "modules[%s] = module_info = {}" %
                 NAME_RE.sub("_", module_name).upper()]
-            for key, value in sorted(module_info.iteritems()):
+            for key, value in sorted(module_info.items()):
                 if value is True or value is False:
                     value = str(value).upper()
                 elif value in ("css", "js"):
@@ -217,8 +219,8 @@ class Builder:
                     # It's easy to think that doing 'CORE_CSS +  %(values)s'
                     # instead of using concat would work, but it doesn't;
                     # you'll end up with a string instead of a list.
-                    module_decl.append("after_list = CORE_CSS");
-                    module_decl.append("after_list.concat(%s)" % value);
+                    module_decl.append("after_list = CORE_CSS")
+                    module_decl.append("after_list.concat(%s)" % value)
                     value = "after_list"
                 if key == "path":
                     value = value.replace(
@@ -229,8 +231,7 @@ class Builder:
 
         modules_decl = ";\n\n  ".join(modules_decl)
 
-        module_config = open(out, "w")
-        try:
+        with open(out, "w") as module_config:
             module_config.write("""var %s = (function(){
   %s;
 
@@ -238,8 +239,6 @@ class Builder:
 
   return modules;
 })();""" % (var_name, variables_decl, modules_decl))
-        finally:
-            module_config.close()
 
     def generate_skin_modules(self, entry, metadata, root):
         # Generate a skin module definition, since YUI assumes that
@@ -369,15 +368,15 @@ def get_options():
 
 
 def main():
-   options, args = get_options()
-   if options.src_dir is None:
-       options.src_dir = os.getcwd()
-   Builder(
-       name=options.name,
-       src_dir=os.path.abspath(options.src_dir),
-       output=options.output,
-       prefix=options.prefix,
-       exclude_regex=options.exclude_regex,
-       ext=options.ext,
-       include_skin=not options.no_skin,
-       ).do_build()
+    options, args = get_options()
+    if options.src_dir is None:
+        options.src_dir = os.getcwd()
+    Builder(
+        name=options.name,
+        src_dir=os.path.abspath(options.src_dir),
+        output=options.output,
+        prefix=options.prefix,
+        exclude_regex=options.exclude_regex,
+        ext=options.ext,
+        include_skin=not options.no_skin,
+    ).do_build()
diff --git a/convoy/tests/__init__.py b/convoy/tests/__init__.py
index e69de29..aef8cae 100644
--- a/convoy/tests/__init__.py
+++ b/convoy/tests/__init__.py
@@ -0,0 +1,76 @@
+#   Convoy is a WSGI app for loading multiple files in the same request.
+#   Copyright (C) 2011-2015 Canonical, Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import os.path
+import shutil
+import tempfile
+import unittest
+
+__all__ = [
+    "ConvoyTestCase",
+]
+
+
+class ConvoyTestCase(unittest.TestCase):
+
+    def makeDir(self, path=None):
+        """Create a temporary directory.
+
+        This directory will be removed when the test completes.
+
+        :param path: An optional directory path to create. If not specified a
+            new directory path will be chosen by `tempfile.mkdtemp`.
+        :return: The path of the newly created directory.
+        """
+        if path is None:
+            path = tempfile.mkdtemp()
+            self.addCleanup(shutil.rmtree, path)
+            return path
+        else:
+            os.makedirs(path)
+            return path
+
+    def makeFile(self, content=None, basename=None, dirname=None, path=None):
+        """Create a temporary file.
+
+        This file will be removed when the test completes.
+
+        :param content: Optional contents for the new file.
+        :param basename: Optional base name for the new file.
+        :param dirname: Optional directory in which to put the new file.
+        :param path: Optional full path to the new file. Mutually exclusive
+            with `basename` and `dirname`.
+        :return: The path of the newly created file.
+        """
+        if path is not None:
+            self.assertIsNone(basename)
+            self.assertIsNone(dirname)
+            self.addCleanup(os.unlink, path)
+        elif basename is not None:
+            if dirname is None:
+                dirname = self.makeDir()
+            path = os.path.join(dirname, basename)
+        else:
+            fileno, path = tempfile.mkstemp(dir=dirname)
+            self.addCleanup(os.unlink, path)
+            os.close(fileno)
+
+        if content is not None:
+            with open(path, "w") as fd:
+                fd.write(content)
+
+        return path
diff --git a/convoy/tests/test_combo.py b/convoy/tests/test_combo.py
index bb9d60d..c291510 100644
--- a/convoy/tests/test_combo.py
+++ b/convoy/tests/test_combo.py
@@ -1,5 +1,5 @@
 #   Convoy is a WSGI app for loading multiple files in the same request.
-#   Copyright (C) 2010-2012  Canonical, Ltd.
+#   Copyright (C) 2011-2015 Canonical, Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as
@@ -18,17 +18,18 @@
 import os
 import difflib
 import textwrap
-from unittest import defaultTestLoader
 
-import mocker
-from paste.fixture import TestApp
+from webtest import TestApp
 
 from convoy.combo import combo_app
 from convoy.combo import combine_files
 from convoy.combo import parse_url
+from convoy.combo import validate_files
+from convoy.combo import InvalidFileError
+from convoy.tests import ConvoyTestCase
 
 
-class ComboTestBase(object):
+class ComboTestBase(ConvoyTestCase):
 
     def makeSampleFile(self, root, fname, content):
         content = textwrap.dedent(content).strip()
@@ -38,19 +39,23 @@ class ComboTestBase(object):
             os.makedirs(parent)
         return self.makeFile(content=content, path=full)
 
-    def assertTextEquals(self, expected, got):
+    def assertTextEquals(self, expected, observed):
+        if isinstance(expected, bytes):
+            expected = expected.decode("utf8")
+        if isinstance(observed, bytes):
+            observed = observed.decode("utf8")
         expected = textwrap.dedent(expected).strip()
-        got = textwrap.dedent(got).strip()
+        observed = textwrap.dedent(observed).strip()
         diff = difflib.unified_diff(expected.splitlines(),
-                                    got.splitlines(), lineterm="")
-        self.assertEquals(expected, got, "\n" + "\n".join(diff))
+                                    observed.splitlines(), lineterm="")
+        self.assertEqual(expected, observed, "\n" + "\n".join(diff))
 
 
-class ComboTest(ComboTestBase, mocker.MockerTestCase):
+class ComboTest(ComboTestBase):
 
     def test_parse_url_keeps_order(self):
         """Parsing a combo loader URL returns an ordered list of filenames."""
-        self.assertEquals(
+        self.assertEqual(
             parse_url(("http://yui.yahooapis.com/combo?"
                        "3.0.0/build/yui/yui-min.js&"
                        "3.0.0/build/oop/oop-min.js&"
@@ -82,12 +87,23 @@ class ComboTest(ComboTestBase, mocker.MockerTestCase):
                               "** oop-min **",
                               "/* event-custom/event-custom-min.js */",
                               "** event-custom-min **"))
-        self.assertEquals(
-            "".join(combine_files(["yui/yui-min.js",
-                                   "oop/oop-min.js",
-                                   "event-custom/event-custom-min.js"],
-                                  root=test_dir)).strip(),
-            expected)
+        self.assertEqual(
+            b"".join(combine_files(
+                ["yui/yui-min.js",
+                 "oop/oop-min.js",
+                 "event-custom/event-custom-min.js"],
+                root=test_dir)).strip(),
+            expected.encode("ascii"))
+
+    def test_combine_files_yields_only_byte_strings(self):
+        """
+        Combined files are always byte strings.
+        """
+        test_dir = self.makeDir()
+        self.makeSampleFile(test_dir, "one.bin", "\x00\x01")
+        self.makeSampleFile(test_dir, "two.txt", "foobar")
+        for part in combine_files(["one.txt", "two.txt"], root=test_dir):
+            self.assertIsInstance(part, bytes)
 
     def test_combine_css_makes_relative_path(self):
         """
@@ -129,9 +145,10 @@ class ComboTest(ComboTestBase, mocker.MockerTestCase):
             }
             """
         self.assertTextEquals(
-            "".join(combine_files(["widget/assets/skins/sam/widget.css",
-                                   "editor/assets/skins/sam/editor.css"],
-                                  root=test_dir)).strip(),
+            b"".join(combine_files(
+                ["widget/assets/skins/sam/widget.css",
+                 "editor/assets/skins/sam/editor.css"],
+                root=test_dir)).strip(),
             expected)
 
     def test_combine_css_leaves_absolute_urls_untouched(self):
@@ -174,9 +191,10 @@ class ComboTest(ComboTestBase, mocker.MockerTestCase):
             }
             """
         self.assertTextEquals(
-            "".join(combine_files(["widget/assets/skins/sam/widget.css",
-                                   "editor/assets/skins/sam/editor.css"],
-                                  root=test_dir)).strip(),
+            b"".join(combine_files(
+                ["widget/assets/skins/sam/widget.css",
+                 "editor/assets/skins/sam/editor.css"],
+                root=test_dir)).strip(),
             expected)
 
     def test_combine_css_leaves_data_uris_untouched(self):
@@ -219,35 +237,10 @@ class ComboTest(ComboTestBase, mocker.MockerTestCase):
             }
             """
         self.assertTextEquals(
-            "".join(combine_files(["widget/assets/skins/sam/widget.css",
-                                   "editor/assets/skins/sam/editor.css"],
-                                  root=test_dir)).strip(),
-            expected)
-
-    def test_missing_file_is_ignored(self):
-        """If a missing file is requested we should still combine others."""
-        test_dir = self.makeDir()
-
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("yui", "yui-min.js"),
-            "** yui-min **"),
-        self.makeSampleFile(
-            test_dir,
-            os.path.join("event-custom", "event-custom-min.js"),
-            "** event-custom-min **"),
-
-        expected = "\n".join(("/* yui/yui-min.js */",
-                              "** yui-min **",
-                              "/* oop/oop-min.js */",
-                              "/* [missing] */",
-                              "/* event-custom/event-custom-min.js */",
-                              "** event-custom-min **"))
-        self.assertEquals(
-            "".join(combine_files(["yui/yui-min.js",
-                                   "oop/oop-min.js",
-                                   "event-custom/event-custom-min.js"],
-                                  root=test_dir)).strip(),
+            b"".join(combine_files(
+                ["widget/assets/skins/sam/widget.css",
+                 "editor/assets/skins/sam/editor.css"],
+                root=test_dir)).strip(),
             expected)
 
     def test_no_parent_hack(self):
@@ -265,10 +258,9 @@ class ComboTest(ComboTestBase, mocker.MockerTestCase):
         hack = "../../oop/oop-min.js"
         self.assertTrue(os.path.exists(os.path.join(root, hack)))
 
-        expected = "\n".join(("/* ../../oop/oop-min.js */",
-                              "/* [missing] */"))
-        self.assertEquals(
-            "".join(combine_files([hack], root=root)).strip(),
+        expected = b""
+        self.assertEqual(
+            b"".join(combine_files([hack], root=root)).strip(),
             expected)
 
     def test_no_absolute_path_hack(self):
@@ -281,9 +273,9 @@ class ComboTest(ComboTestBase, mocker.MockerTestCase):
         hack = "/etc/passwd"
         self.assertTrue(os.path.exists("/etc/passwd"))
 
-        expected = "/* /etc/passwd */\n/* [missing] */"
-        self.assertEquals(
-            "".join(combine_files([hack], root=test_dir)).strip(),
+        expected = b""
+        self.assertEqual(
+            b"".join(combine_files([hack], root=test_dir)).strip(),
             expected)
 
     def test_no_traversing_out_of_root(self):
@@ -295,17 +287,17 @@ class ComboTest(ComboTestBase, mocker.MockerTestCase):
 
         hack = ".."
 
-        expected = "/* .. */\n/* [missing] */"
-        self.assertEquals(
-            "".join(combine_files([hack], root=test_dir)).strip(),
+        expected = b""
+        self.assertEqual(
+            b"".join(combine_files([hack], root=test_dir)).strip(),
             expected)
 
         # from /tmp/somedir we want to try to walk up to / and into
         # etc/password
         hack = "../../etc/password"
-        expected = "/* ../../etc/password */\n/* [missing] */"
-        self.assertEquals(
-            "".join(combine_files([hack], root=test_dir)).strip(),
+        expected = b""
+        self.assertEqual(
+            b"".join(combine_files([hack], root=test_dir)).strip(),
             expected)
 
     def test_combine_css_adds_custom_prefix(self):
@@ -348,38 +340,89 @@ class ComboTest(ComboTestBase, mocker.MockerTestCase):
             }
             """
         self.assertTextEquals(
-            "".join(combine_files(["widget/assets/skins/sam/widget.css",
-                                   "editor/assets/skins/sam/editor.css"],
-                                  root=test_dir,
-                                  resource_prefix="/static/")).strip(),
+            b"".join(combine_files(
+                ["widget/assets/skins/sam/widget.css",
+                 "editor/assets/skins/sam/editor.css"],
+                root=test_dir, resource_prefix="/static/")).strip(),
+            expected)
+
+    def test_combine_css_adds_custom_prefix_minified(self):
+        """
+        The prefix is added to all url() declaration in CSS files, when the
+        content of the .css file is minified.
+        """
+        test_dir = self.makeDir()
+
+        self.makeSampleFile(
+            test_dir,
+            os.path.join("path", "to", "widget.css"),
+            ".foo{background:url(foo.png);}"
+            ".bar{background:url(bar.png);}")
+        expected = (
+            "/* path/to/widget.css */\n"
+            ".foo{background:url(/static/path/to/foo.png);}"
+            ".bar{background:url(/static/path/to/bar.png);}")
+        self.assertTextEquals(
+            b"".join(combine_files(
+                ["path/to/widget.css"], root=test_dir,
+                resource_prefix="/static/")),
             expected)
 
     def test_rewrite_url_normalizes_parent_references(self):
         """URL references in CSS files get normalized for parent dirs."""
         test_dir = self.makeDir()
-        files = [
-            self.makeSampleFile(
-                test_dir,
-                os.path.join("yui", "base", "base.css"),
-                ".foo{background-image:url(../../img.png)}"),
-            ]
+        self.makeSampleFile(
+            test_dir, os.path.join("yui", "base", "base.css"),
+            ".foo{background-image:url(../../img.png)}"),
 
         expected = """
             /* yui/base/base.css */
             .foo{background-image:url(img.png)}
             """
         self.assertTextEquals(
-            "".join(combine_files(["yui/base/base.css"],
-                                  root=test_dir)).strip(),
+            b"".join(combine_files(
+                ["yui/base/base.css"],
+                root=test_dir)).strip(),
             expected)
 
 
-class WSGIComboTest(ComboTestBase, mocker.MockerTestCase):
+class ValidateFilesTest(ComboTestBase):
+
+    def test_missing_file_is_ignored(self):
+        """If a missing file is requested we should still combine others."""
+        test_dir = self.makeDir()
+
+        self.makeSampleFile(
+            test_dir,
+            os.path.join("yui", "yui-min.js"),
+            "** yui-min **"),
+        self.makeSampleFile(
+            test_dir,
+            os.path.join("event", "event-min.js"),
+            "** event-min **"),
+
+        self.assertRaises(
+            InvalidFileError, validate_files,
+            ["yui/yui-min.js", "oop/oop-min.js", "event/event-min.js"],
+            root=test_dir)
+
+
+class WSGIComboTest(ComboTestBase):
 
     def setUp(self):
         self.root = self.makeDir()
         self.app = TestApp(combo_app(self.root))
 
+    def assertHeaders(self, observed, expected):
+        """Ensure that the `expected` headers are present in `observed`.
+
+        :param observed: A mapping of HTTP response headers.
+        :param expected: A list of HTTP response headers (as 2-tuples).
+        """
+        for name, value in expected:
+            self.assertIn(name, observed)
+            self.assertEqual(value, observed[name])
+
     def test_combo_app_sets_content_type_for_js(self):
         """The WSGI App should set a proper Content-Type for Javascript."""
         self.makeSampleFile(
@@ -406,9 +449,11 @@ class WSGIComboTest(ComboTestBase, mocker.MockerTestCase):
             ["yui/yui-min.js",
              "oop/oop-min.js",
              "event-custom/event-custom-min.js"]), status=200)
-        self.assertEquals(res.headers, [("Content-Type", "text/javascript"),
-                                        ("X-Content-Type-Options", "nosniff")])
-        self.assertEquals(res.body.strip(), expected)
+        self.assertHeaders(res.headers, [
+            ("Content-Type", "text/javascript"),
+            ("X-Content-Type-Options", "nosniff"),
+        ])
+        self.assertEqual(res.body.strip(), expected.encode("ascii"))
 
     def test_combo_app_sets_content_type_for_css(self):
         """The WSGI App should set a proper Content-Type for CSS."""
@@ -421,27 +466,39 @@ class WSGIComboTest(ComboTestBase, mocker.MockerTestCase):
 
         res = self.app.get("/?" + "&".join(
             ["widget/skin/sam/widget.css"]), status=200)
-        self.assertEquals(res.headers, [("Content-Type", "text/css"),
-                                        ("X-Content-Type-Options", "nosniff")])
-        self.assertEquals(res.body.strip(), expected)
+        self.assertHeaders(res.headers, [
+            ("Content-Type", "text/css"),
+            ("X-Content-Type-Options", "nosniff"),
+        ])
+        self.assertEqual(res.body.strip(), expected.encode("ascii"))
 
     def test_no_filename_gives_404(self):
         """If no filename is included, a 404 should be returned."""
         res = self.app.get("/", status=404)
-        self.assertEquals(res.headers, [("Content-Type", "text/plain")])
-        self.assertEquals(res.body, "Not Found")
+        self.assertHeaders(res.headers, [("Content-Type", "text/plain")])
+        self.assertEqual(res.body, b"Not Found")
 
     def test_bogus_filenames_are_plain_text_and_not_sniffed(self):
         """
         Content-Type and X-Content-Type-Options headers set for
         non-existent files.
         """
-        res = self.app.get("/?" + "&".join(
-                ["foo/bar/baz",
-                 "<html><script>alert(document.domain)</script></html>"]),
-                           status=200)
-        self.assertEquals(res.headers, [("Content-Type", "text/plain"),
-                                        ("X-Content-Type-Options", "nosniff")])
+        res = self.app.get(
+            "/?" + "&".join([
+                "foo/bar/baz",
+                "<html><script>alert(document.domain)</script></html>",
+            ]),
+            status=400)
+        self.assertHeaders(res.headers, [
+            ("Content-Type", "text/plain"),
+            ("X-Content-Type-Options", "nosniff"),
+        ])
+
+    def test_js_comment_escape_hack(self):
+        """Attacks to break out of the JS comment will get a 400 error."""
+        res = self.app.get("/?%s" % "*/alert%28%27owned%27%29/*",
+                           status=400)
+        self.assertEqual(res.body.strip(), b"Bad Request")
 
     def test_combo_respects_path_hints(self):
         """If I add path info into the combo url, convoy should use it."""
@@ -476,13 +533,11 @@ class WSGIComboTest(ComboTestBase, mocker.MockerTestCase):
         expected2 = "\n".join(("/* yui/yui-min.js */",
                                "/* yui-min-2 */"))
 
-        res = app.get("/%s/?%s" % (first_base,
-            "yui/yui-min.js"), status=200)
-        self.assertEquals(res.body.strip(), expected)
+        res = app.get("/%s/?%s" % (first_base, "yui/yui-min.js"), status=200)
+        self.assertEqual(res.body.strip(), expected.encode("ascii"))
 
-        res = app.get("/%s/?%s" % (second_base, "&".join(
-            ["yui/yui-min.js"])), status=200)
-        self.assertEquals(res.body.strip(), expected2)
+        res = app.get("/%s/?%s" % (second_base, "yui/yui-min.js"), status=200)
+        self.assertEqual(res.body.strip(), expected2.encode("ascii"))
 
     def test_path_hint_cant_break_root(self):
         """You should not be able to get outside of the root via path hint."""
@@ -492,6 +547,15 @@ class WSGIComboTest(ComboTestBase, mocker.MockerTestCase):
         # and ask for passwd, it's inside the new adjusted root
         app.get("/../etc?yui-min&passwd", status=400)
 
-
-def test_suite():
-    return defaultTestLoader.loadTestsFromName(__name__)
+    def test_cache_headers_set(self):
+        app = TestApp(combo_app(
+            self.root, additional_headers=[
+                ('Cache-Control', 'max-age=3600, public'),
+            ]))
+        res = app.get("/?" + "&".join(
+            ["widget/skin/sam/widget.css"]), status=400)
+        self.assertHeaders(res.headers, [
+            ("Content-Type", "text/css"),
+            ("X-Content-Type-Options", "nosniff"),
+            ('Cache-Control', 'max-age=3600, public'),
+        ])
diff --git a/convoy/tests/test_meta.py b/convoy/tests/test_meta.py
index 813af6a..1d9de2d 100644
--- a/convoy/tests/test_meta.py
+++ b/convoy/tests/test_meta.py
@@ -1,5 +1,5 @@
 #   Convoy is a WSGI app for loading multiple files in the same request.
-#   Copyright (C) 2010-2012  Canonical, Ltd.
+#   Copyright (C) 2011-2015 Canonical, Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as
@@ -16,11 +16,9 @@
 
 
 import os
-from unittest import defaultTestLoader, TestCase
-
-import mocker
 
 from convoy.meta import Builder, extract_metadata
+from convoy.tests import ConvoyTestCase
 
 
 class TestBuilder(Builder):
@@ -30,12 +28,32 @@ class TestBuilder(Builder):
         pass
 
 
-class ExtractMetadataTest(TestCase):
+class ExtractMetadataTest(ConvoyTestCase):
+
+    def test_extract_with_comments(self):
+        """
+        Extracting the metadata of a file containing comments
+        in its requires block should still successfully
+        extract its requirements.
+        """
+        metadata = extract_metadata("""\
+        YUI.add('lazr.base', function(Y){
+           Y.log('Hello World');
+        }, '0.1', {
+           "requires": [
+               // this is a comment
+               "node", "base" // so is this
+           ]
+        });
+        """)
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.base")
+        self.assertEqual(metadata[0]["requires"], ["node", "base"])
 
     def test_extract_single_module(self):
         """
         Extracting the metadata of a file containing a single module
-        should successfully extract it's requirements.
+        should successfully extract its requirements.
         """
         metadata = extract_metadata("""\
         YUI.add('lazr.base', function(Y){
@@ -43,9 +61,9 @@ class ExtractMetadataTest(TestCase):
         }, '0.1', {"requires": ["node", "base"]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.base")
-        self.assertEquals(metadata[0]["requires"], ["node", "base"])
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.base")
+        self.assertEqual(metadata[0]["requires"], ["node", "base"])
 
     def test_extract_multiple_modules(self):
         """
@@ -61,13 +79,13 @@ class ExtractMetadataTest(TestCase):
         }, '0.1', {"requires": ["node", "anim", "event"]});
         """)
 
-        self.assertEquals(len(metadata), 2)
+        self.assertEqual(len(metadata), 2)
 
-        self.assertEquals(metadata[0]["name"], "lazr.base")
-        self.assertEquals(metadata[0]["requires"], ["node", "base"])
+        self.assertEqual(metadata[0]["name"], "lazr.base")
+        self.assertEqual(metadata[0]["requires"], ["node", "base"])
 
-        self.assertEquals(metadata[1]["name"], "lazr.anim")
-        self.assertEquals(metadata[1]["requires"], ["node", "anim", "event"])
+        self.assertEqual(metadata[1]["name"], "lazr.anim")
+        self.assertEqual(metadata[1]["requires"], ["node", "anim", "event"])
 
     def test_extract_multi_line(self):
         """
@@ -81,9 +99,9 @@ class ExtractMetadataTest(TestCase):
                               "event"]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.anim")
-        self.assertEquals(metadata[0]["requires"], ["node", "anim", "event"])
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.anim")
+        self.assertEqual(metadata[0]["requires"], ["node", "anim", "event"])
 
     def test_extract_odd_spacing(self):
         """
@@ -96,9 +114,9 @@ class ExtractMetadataTest(TestCase):
         }, '0.1', {"requires": [ "node" ,"anim"  ,  "event" ]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.anim")
-        self.assertEquals(metadata[0]["requires"], ["node", "anim", "event"])
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.anim")
+        self.assertEqual(metadata[0]["requires"], ["node", "anim", "event"])
 
     def test_extract_with_use(self):
         """
@@ -108,13 +126,14 @@ class ExtractMetadataTest(TestCase):
         metadata = extract_metadata("""\
         YUI.add('lazr.anim', function(Y){
            Y.log('Hello World');
-        }, '0.1', {"use": ["dom"], "requires": [ "node" ,"anim"  ,  "event" ]});
+        }, '0.1', {"use": ["dom"], "requires": [
+                        "node" ,"anim"  ,  "event" ]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.anim")
-        self.assertEquals(metadata[0]["requires"], ["node", "anim", "event"])
-        self.assertEquals(metadata[0]["use"], ["dom"])
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.anim")
+        self.assertEqual(metadata[0]["requires"], ["node", "anim", "event"])
+        self.assertEqual(metadata[0]["use"], ["dom"])
 
     def test_extract_with_requires_before_use(self):
         """
@@ -123,13 +142,14 @@ class ExtractMetadataTest(TestCase):
         metadata = extract_metadata("""\
         YUI.add('lazr.anim', function(Y){
            Y.log('Hello World');
-        }, '0.1', {"requires": [ "node" ,"anim"  ,  "event" ], "use": ["dom"]});
+        }, '0.1', {"requires": [ "node" ,"anim"  ,  "event" ],
+                   "use": ["dom"]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.anim")
-        self.assertEquals(metadata[0]["requires"], ["node", "anim", "event"])
-        self.assertEquals(metadata[0]["use"], ["dom"])
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.anim")
+        self.assertEqual(metadata[0]["requires"], ["node", "anim", "event"])
+        self.assertEqual(metadata[0]["use"], ["dom"])
 
     def test_extract_requires_in_new_line(self):
         """
@@ -148,10 +168,10 @@ class ExtractMetadataTest(TestCase):
         ]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.anim")
-        self.assertEquals(metadata[0]["requires"], ["node", "anim", "event"])
-        self.assertEquals(metadata[0]["use"], ["dom"])
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.anim")
+        self.assertEqual(metadata[0]["requires"], ["node", "anim", "event"])
+        self.assertEqual(metadata[0]["use"], ["dom"])
 
     def test_extract_metadata_not_metadata(self):
         """
@@ -159,11 +179,13 @@ class ExtractMetadataTest(TestCase):
         """
         metadata = extract_metadata("""
         YUI.add('test', function(Y) {
-            this._dds[h[i]] = new YAHOO.util.DragDrop(this._handles[h[i]], this.get('id') + '-handle-' + h, { useShim: this.get('useShim') });
+            this._dds[h[i]] = new YAHOO.util.DragDrop(
+              this._handles[h[i]], this.get('id') + '-handle-' + h, {
+                useShim: this.get('useShim') });
         }, '1.0', {requires: ['dom']});
         """)
 
-        self.assertEquals(metadata[0]["requires"], ["dom"])
+        self.assertEqual(metadata[0]["requires"], ["dom"])
 
     def test_extract_metadata_single_quotes(self):
         """
@@ -182,11 +204,10 @@ class ExtractMetadataTest(TestCase):
         ]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.anim")
-        self.assertEquals(metadata[0]["requires"], ["node", "anim", "event"])
-        self.assertEquals(metadata[0]["use"], ["dom"])
-
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.anim")
+        self.assertEqual(metadata[0]["requires"], ["node", "anim", "event"])
+        self.assertEqual(metadata[0]["use"], ["dom"])
 
     def test_extract_has_no_quotes(self):
         """
@@ -205,10 +226,10 @@ class ExtractMetadataTest(TestCase):
         ]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.anim")
-        self.assertEquals(metadata[0]["requires"], ["node", "anim", "event"])
-        self.assertEquals(metadata[0]["use"], ["dom"])
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.anim")
+        self.assertEqual(metadata[0]["requires"], ["node", "anim", "event"])
+        self.assertEqual(metadata[0]["use"], ["dom"])
 
     def test_extract_has_single_quotes(self):
         """
@@ -227,10 +248,10 @@ class ExtractMetadataTest(TestCase):
         ]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.anim")
-        self.assertEquals(metadata[0]["requires"], ["node", "anim", "event"])
-        self.assertEquals(metadata[0]["use"], ["dom"])
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.anim")
+        self.assertEqual(metadata[0]["requires"], ["node", "anim", "event"])
+        self.assertEqual(metadata[0]["use"], ["dom"])
 
     def test_extract_has_use(self):
         """
@@ -250,10 +271,10 @@ class ExtractMetadataTest(TestCase):
         ]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.anim")
-        self.assertEquals(metadata[0]["requires"], ["node", "anim", "event"])
-        self.assertEquals(metadata[0]["use"], ["cause", "dom"])
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.anim")
+        self.assertEqual(metadata[0]["requires"], ["node", "anim", "event"])
+        self.assertEqual(metadata[0]["use"], ["cause", "dom"])
 
     def test_extract_with_use_and_no_requires(self):
         """
@@ -265,9 +286,9 @@ class ExtractMetadataTest(TestCase):
         }, '0.1', {"use": ["dom"]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.anim")
-        self.assertEquals(metadata[0]["use"], ["dom"])
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.anim")
+        self.assertEqual(metadata[0]["use"], ["dom"])
 
     def test_extract_with_all_options(self):
         """
@@ -286,15 +307,20 @@ class ExtractMetadataTest(TestCase):
                    "after": ["lazr.base"]});
         """)
 
-        self.assertEquals(len(metadata), 1)
-        self.assertEquals(metadata[0]["name"], "lazr.anim")
-        self.assertEquals(metadata[0]["use"], ["dom"])
-        self.assertEquals(metadata[0]["omit"], ["nono"])
-        self.assertEquals(metadata[0]["optional"], ["meh"])
-        self.assertEquals(metadata[0]["supersedes"], ["old-anim"])
-        self.assertEquals(metadata[0]["after"], ["lazr.base"])
+        self.assertEqual(len(metadata), 1)
+        self.assertEqual(metadata[0]["name"], "lazr.anim")
+        self.assertEqual(metadata[0]["use"], ["dom"])
+        self.assertEqual(metadata[0]["omit"], ["nono"])
+        self.assertEqual(metadata[0]["optional"], ["meh"])
+        self.assertEqual(metadata[0]["supersedes"], ["old-anim"])
+        self.assertEqual(metadata[0]["after"], ["lazr.base"])
+
 
-class GenerateMetadataTest(mocker.MockerTestCase):
+class GenerateMetadataTest(ConvoyTestCase):
+
+    def readFile(self, path):
+        with open(path, "r") as fd:
+            return fd.read()
 
     def test_generate_metadata_simple(self):
         """
@@ -314,10 +340,10 @@ class GenerateMetadataTest(mocker.MockerTestCase):
                               output=output, exclude_regex="")
         builder.do_build()
 
-        got = open(output, "r").read()
+        got = self.readFile(output)
         prefix = got[:18]
         modules = "\n\n".join(got.split("\n\n")[1:-1])
-        self.assertEquals(prefix, "var LAZR_CONFIG = ")
+        self.assertEqual(prefix, "var LAZR_CONFIG = ")
         self.assertTrue('[PATH] = "anim/anim-min.js"' in modules)
         self.assertFalse('[SKINNABLE] = FALSE' in modules)
         self.assertTrue('[TYPE] = JS' in modules)
@@ -350,10 +376,10 @@ class GenerateMetadataTest(mocker.MockerTestCase):
                               prefix="lazr")
         builder.do_build()
 
-        got = open(output, "r").read()
+        got = self.readFile(output)
         prefix = got[:18]
         modules = "\n\n".join(got.split("\n\n")[1:-1])
-        self.assertEquals(prefix, "var LAZR_CONFIG = ")
+        self.assertEqual(prefix, "var LAZR_CONFIG = ")
         self.assertTrue(
             '[PATH] = PREFIX + '
             '"/anim/assets/skins/sam/anim-skin.css"' in modules)
@@ -392,10 +418,10 @@ class GenerateMetadataTest(mocker.MockerTestCase):
                               prefix=None)
         builder.do_build()
 
-        got = open(output, "r").read()
+        got = self.readFile(output)
         prefix = got[:18]
         modules = "\n\n".join(got.split("\n\n")[1:-1])
-        self.assertEquals(prefix, "var LAZR_CONFIG = ")
+        self.assertEqual(prefix, "var LAZR_CONFIG = ")
         self.assertFalse('  PREFIX =' in got, got)
         self.assertTrue(
             '[PATH] = "anim/assets/skins/sam/anim-skin.css"' in modules)
@@ -429,10 +455,10 @@ class GenerateMetadataTest(mocker.MockerTestCase):
                               prefix=None)
         builder.do_build()
 
-        got = open(output, "r").read()
+        got = self.readFile(output)
         prefix = got[:18]
         modules = "\n\n".join(got.split("\n\n")[1:-1])
-        self.assertEquals(prefix, "var LAZR_CONFIG = ")
+        self.assertEqual(prefix, "var LAZR_CONFIG = ")
         self.assertFalse('  PREFIX =' in got, got)
         self.assertTrue(
             '[PATH] = "anim-min.js"' in modules)
@@ -474,11 +500,11 @@ class GenerateMetadataTest(mocker.MockerTestCase):
                               prefix="lazr")
         builder.do_build()
 
-        got = open(output, "r").read()
+        got = self.readFile(output)
         prefix = got[:18]
         blocks = got.split("\n\n")
         modules = "\n\n".join(blocks[1:-1])
-        self.assertEquals(prefix, "var LAZR_CONFIG = ")
+        self.assertEqual(prefix, "var LAZR_CONFIG = ")
 
         self.assertTrue(
             '[PATH] = PREFIX + "/anim/assets/purty-anim-core.css"' in modules)
@@ -527,7 +553,7 @@ class GenerateMetadataTest(mocker.MockerTestCase):
                               prefix="lazr")
         builder.do_build()
 
-        got = open(output, "r").read()
+        got = self.readFile(output)
         self.assertIn('AFTER = "after",', got)
         self.assertIn('EXT = "ext",', got)
         self.assertIn('OPTIONAL = "optional",', got)
@@ -536,7 +562,3 @@ class GenerateMetadataTest(mocker.MockerTestCase):
         self.assertIn('SKINNABLE = "skinnable",', got)
         self.assertIn('SUPERSEDES = "supersedes",', got)
         self.assertIn('USE = "use",', got)
-
-
-def test_suite():
-    return defaultTestLoader.loadTestsFromName(__name__)
diff --git a/debian/changelog b/debian/changelog
index 4f051e9..96c8e67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+convoy (0.2.1+bzr39-1ubuntu1) focal; urgency=medium
+
+  * Drop python2 package in favor of python3.
+    - Change autopkgtest to use python3 dependencies.  Drop dependence on
+      python-mocker since there's no py3 version of it; the testsuite
+      doesn't appear to need it when run under python3.
+
+ -- Bryce Harrington <[e-mail]>  Wed, 08 Jan 2020 15:42:58 -0800
+
+convoy (0.2.1+bzr39-1build1) focal; urgency=medium
+
+  * No-change rebuild to generate dependencies on python2.
+
+ -- Matthias Klose <[e-mail]>  Tue, 17 Dec 2019 12:31:52 +0000
+
+convoy (0.2.1+bzr39-1) xenial; urgency=medium
+
+  * New upstream snapshot.
+  * Build with python3.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 12 Nov 2015 16:26:56 +0000
+
 convoy (0.2.1+bzr25-3) unstable; urgency=low
 
   * Add missing autopkgtest dependencies on python-mocker and python-
diff --git a/debian/control b/debian/control
index fb59b84..cb70840 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,24 @@
 Source: convoy
 Section: python
 Priority: extra
-Maintainer: Jelmer Vernooij <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~),
-               python-all (>= 2.6.6-3~),
-               python-mocker,
-               python-nose,
-               python-paste,
-               python-setuptools
-Standards-Version: 3.9.5
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jelmer Vernooij <[e-mail]>
+Build-Depends: debhelper (>= 9~),
+               dh-python,
+               python3-all,
+               python3-nose,
+               python3-paste,
+               python3-setuptools,
+               python3-webtest
+Standards-Version: 3.9.6
 Homepage: https://launchpad.net/convoy
+X-Python3-Version: >= 3.4
 XS-Testsuite: autopkgtest
 
-Package: python-convoy
+Package: python3-convoy
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Description: WSGI app for loading multiple files in the same request
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: WSGI app for loading multiple files in the same request (Python 3)
  Provides a WSGI application that can be hooked up to a
  generic WSGI container to create a combo loader server, for
  loading Javascript and CSS files combined into a single
diff --git a/debian/python-convoy.install b/debian/python-convoy.install
new file mode 100644
index 0000000..6a53a3b
--- /dev/null
+++ b/debian/python-convoy.install
@@ -0,0 +1 @@
+usr/lib/python2*/*-packages/*
diff --git a/debian/python3-convoy.install b/debian/python3-convoy.install
new file mode 100644
index 0000000..87e0b0a
--- /dev/null
+++ b/debian/python3-convoy.install
@@ -0,0 +1 @@
+usr/lib/python3/*-packages/*
diff --git a/debian/rules b/debian/rules
index 236638b..2d4f261 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,22 @@
 #!/usr/bin/make -f
+export PYBUILD_NAME=convoy
+
+PYVERS := $(shell py3versions -r)
 
 %:
-	dh  $@ --buildsystem=python_distutils --with python2
+	dh  $@ --with python3 --buildsystem=pybuild
+
+override_dh_auto_install:
+	dh_auto_install
+	set -ex; for python in $(PYVERS); do \
+		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+	done
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-		python$* setup.py test
+		set -ex; for python in $(PYVERS); do \
+			$$python setup.py test; \
+		done
 endif
 
 
diff --git a/debian/tests/control b/debian/tests/control
index ddb7fae..e2c7467 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: testsuite
-Depends: python-convoy, python-mocker, python-paste
+Depends: python3-convoy, python3-paste
 Restrictions: allow-stderr
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index b1846e0..de41ca5 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,2 +1,2 @@
 #!/bin/sh -ex
-python -m unittest discover convoy/tests
+python3 -m unittest discover convoy/tests
diff --git a/setup.py b/setup.py
index c6c4be3..aec07a0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 #   Convoy is a WSGI app for loading multiple files in the same request.
-#   Copyright (C) 2010-2012  Canonical, Ltd.
+#   Copyright (C) 2011-2015 Canonical, Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as
@@ -14,43 +14,20 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from setuptools import setup
 
-import os
-from distutils.core import setup
-
-# If setuptools is present, use it to find_packages(), and also
-# declare our dependency on epsilon.
-extra_setup_args = {}
-try:
-    from setuptools import find_packages
-    extra_setup_args = {
-        'install_requires': ['Paste'],
-        'tests_require': ['nose', 'mocker']
-        }
-except ImportError:
-    def find_packages(exclude=None):
-        """
-        Compatibility wrapper.
-
-        Taken from storm setup.py.
-        """
-        packages = []
-        for directory, subdirectories, files in os.walk("convoy"):
-            if '__init__.py' in files:
-                packages.append(directory.replace(os.sep, '.'))
-        return packages
 
 setup(
     name="convoy",
-    version="0.2.4",
-    description="A combo WSGI application for use with YUI",
+    version="0.4.4",
+    description="A combo-loader for Javascript and CSS.",
     author="Canonical Javascripters",
+    author_email="-",
     url="https://launchpad.net/convoy",
     license="AGPL",
-    packages=find_packages(exclude=('convoy.tests',)),
-    include_package_data=True,
-    zip_safe=False,
-    test_suite="nose.collector",
+    packages=['convoy'],
+    test_suite="convoy.tests",
+    tests_require=['nose', 'webtest'],
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
@@ -58,8 +35,8 @@ setup(
         "Intended Audience :: Information Technology",
         "License :: OSI Approved :: GNU Affero General Public License v3",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 3",
         "Topic :: Internet :: WWW/HTTP",
-       ],
-    **extra_setup_args
-    )
-
+    ],
+)
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..e72377d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,5 @@
+[tox]
+envlist = py27, py34, py35
+
+[testenv]
+commands = {envbindir}/python {toxinidir}/setup.py test