Merge pull request #11 from sprockets/remove-deprecation

Remove _mark_deprecated wrapper.
This commit is contained in:
Gavin M. Roy 2016-02-29 14:39:09 -05:00
commit 0c1c757b37
2 changed files with 8 additions and 20 deletions

View file

@ -1,6 +1,11 @@
Version History
===============
`2.0.1`_ (29 Feb 2016)
----------------------
- Removed deprecation wrapper since it seems to cause really interesting
problems including the much feared meta-class error.
`2.0.0`_ (24 Feb 2016)
----------------------
- Repackage from a module into a package. Distributing raw modules inside

View file

@ -21,25 +21,8 @@ except ImportError as error: # pragma no cover
set_default_content_type = _error_closure
def _mark_deprecated(func):
msg = '{0}.{1} is deprecated, use {0}.content.{1} instead'.format(
'sprockets.mixins.mediatype', func.__name__)
@functools.wraps(func)
def wrapper(*args, **kwargs):
warnings.warn(msg, category=DeprecationWarning)
return func(*args, **kwargs)
return wrapper
add_binary_content_type = _mark_deprecated(add_binary_content_type)
add_text_content_type = _mark_deprecated(add_text_content_type)
set_default_content_type = _mark_deprecated(set_default_content_type)
ContentMixin = _mark_deprecated(ContentMixin)
ContentSettings = _mark_deprecated(ContentSettings)
version_info = (2, 0, 0)
version_info = (2, 0, 1)
__version__ = '.'.join(str(v) for v in version_info)
__all__ = ('ContentMixin', 'ContentSettings', 'add_binary_content_type',
__all__ = ['ContentMixin', 'ContentSettings', 'add_binary_content_type',
'add_text_content_type', 'set_default_content_type',
'version_info', '__version__')
'version_info', '__version__']