Merge pull request #27 from dave-shawley/backport-26

Backport #26
sprockets · May 4, 2020 · 5495cb3 · 5495cb3
2 parents 4f187f8 + 64f707f
commit 5495cb3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2016 AWeber Communications
+Copyright (c) 2015-2020 AWeber Communications
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/docs/conf.py b/docs/conf.py
@@ -9,7 +9,7 @@
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'sprockets.mixins.mediatype'
-copyright = '2015-2016, AWeber Communications'
+copyright = '2015-2020, AWeber Communications'
 release = __version__
 version = '.'.join(release.split('.')[0:1])
 

diff --git a/docs/history.rst b/docs/history.rst
@@ -1,6 +1,11 @@
 Version History
 ===============
 
+`2.2.3`_ (4 May 2020)
+---------------------
+- Do not print tracebacks when failing to parse request body.
+  This is a backport of https://github.com/sprockets/sprockets.mixins.mediatype/pull/26
+
 `2.2.2`_ (7 Apr 2018)
 ---------------------
 - Add support for Python 3.5 throug 3.7

diff --git a/sprockets/mixins/mediatype/__init__.py b/sprockets/mixins/mediatype/__init__.py
@@ -23,7 +23,7 @@ def __init__(self, *args, **kwargs):
     set_default_content_type = _error_closure
 
 
-version_info = (2, 2, 2)
+version_info = (2, 2, 3)
 __version__ = '.'.join(str(v) for v in version_info)
 __all__ = ['ContentMixin', 'ContentSettings', 'add_binary_content_type',
            'add_text_content_type', 'set_default_content_type',

diff --git a/sprockets/mixins/mediatype/content.py b/sprockets/mixins/mediatype/content.py
@@ -351,7 +351,7 @@ def get_request_body(self):
             try:
                 self._request_body = handler.from_bytes(self.request.body)
             except Exception:
-                self._logger.exception('failed to decode request body')
+                self._logger.error('failed to decode request body')
                 raise web.HTTPError(400, 'failed to decode request')
 
         return self._request_body