Merge branch 'hotfix/render-palette-images'

 [SVCS-819]

Author: felliott

mfr/extensions/codepygments/render.py

@@ -62,7 +62,7 @@ def _render_html(self, fp, ext, *args, **kwargs):
         content, encoding = None, 'utf-8'
         try:
             content = data.decode(encoding)
-        except UnicodeDecodeError as e:
+        except UnicodeDecodeError:
             detected_encoding = chardet.detect(data)
             encoding = detected_encoding.get('encoding', None)
             if encoding is None:

mfr/extensions/image/export.py

@@ -44,6 +44,13 @@ def export(self):
                     image = image.resize((round(image.size[0] * ratio),
                                           round(image.size[1] * ratio)), Image.ANTIALIAS)
 
+            # Mode 'P' is for paletted images. They must be converted to RGB before exporting to
+            # jpeg, otherwise Pillow will throw an error.  This is a temporary workaround, as the
+            # conversion is imprecise and can be ugly.
+            # See: https://stackoverflow.com/q/21669657
+            if image.mode == 'P':
+                image = image.convert('RGB')
+
             # handle transparency
             # from https://github.com/python-pillow/Pillow/issues/2609
             if image.mode in ('RGBA', 'RGBa', 'LA') and type in ['jpeg', 'jpg']:

mfr/server/handlers/core.py

@@ -169,7 +169,7 @@ def write_error(self, status_code, exc_info):
 
                 current['materialized_type'] = '.'.join([x[0] for x in exc.attr_stack])
                 self.error_metrics = current
-            except Exception as exc:
+            except Exception:
                 pass
             self.set_status(exc.code)
             self.finish(exc.as_html())