Merge pull request #13 from sprockets/release-2.1.0

Release 2.1.0
sprockets · Mar 16, 2016 · e46ff55 · e46ff55
2 parents 14f3533 + 3e9ad72
commit e46ff55
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/docs/history.rst b/docs/history.rst
@@ -1,8 +1,8 @@
 Version History
 ===============
 
-`Next Release`_
----------------
+`2.1.0`_ (16 Mar 2016)
+----------------------
 - Set the _`Vary` header if we are setting the content type.
 
 `2.0.1`_ (29 Feb 2016)
@@ -42,7 +42,8 @@ Version History
 ---------------------
 - Initial Release
 
-.. _Next Release: https://github.com/sprockets/sprockets.http/compare/2.0.1...HEAD
+.. _Next Release: https://github.com/sprockets/sprockets.http/compare/2.1.0...HEAD
+.. _2.1.0: https://github.com/sprockets/sprockets.http/compare/2.0.1...2.1.0
 .. _2.0.1: https://github.com/sprockets/sprockets.http/compare/2.0.0...2.0.1
 .. _2.0.0: https://github.com/sprockets/sprockets.http/compare/1.0.4...2.0.0
 .. _1.0.4: https://github.com/sprockets/sprockets.http/compare/1.0.3...1.0.4

diff --git a/sprockets/mixins/mediatype/__init__.py b/sprockets/mixins/mediatype/__init__.py
@@ -14,14 +14,18 @@
     def _error_closure(*args, **kwargs):
         raise error
 
-    ContentMixin = _error_closure
-    ContentSettings = _error_closure
+    class ErrorClosureClass(object):
+        def __init__(self, *args, **kwargs):
+            raise error
+
+    ContentMixin = ErrorClosureClass
+    ContentSettings = ErrorClosureClass
     add_binary_content_type = _error_closure
     add_text_content_type = _error_closure
     set_default_content_type = _error_closure
 
 
-version_info = (2, 0, 1)
+version_info = (2, 1, 0)
 __version__ = '.'.join(str(v) for v in version_info)
 __all__ = ['ContentMixin', 'ContentSettings', 'add_binary_content_type',
            'add_text_content_type', 'set_default_content_type',