# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1533199860 -7200
# Node ID fbca079ab5f5ba28195c70ed50dd9da74a3d6c51
# Parent  4a0624a3a5491869f23d8fe1dd803084855299e1
Correct which settings is used to set PIL MAX_IMAGE_PIXELS.

diff -r 4a0624a3a549 -r fbca079ab5f5 src/iconolab/apps.py
--- a/src/iconolab/apps.py	Thu Aug 02 09:09:39 2018 +0200
+++ b/src/iconolab/apps.py	Thu Aug 02 10:51:00 2018 +0200
@@ -7,7 +7,8 @@
     def ready(self):
         import iconolab.signals.handlers
         import iconolab.templatetags.iconolab_tags
-        from iconolab.conf import settings
+        from iconolab.conf import settings as iconolab_settings
+        from django.conf import settings
         from PIL import Image
         if settings.ICONOLAB_MAX_IMAGE_PIXELS and settings.ICONOLAB_MAX_IMAGE_PIXELS > 0:
             Image.MAX_IMAGE_PIXELS = settings.ICONOLAB_MAX_IMAGE_PIXELS