Commits

Anonymous committed e382396 Merge

Merged changes

Comments (0)

Files changed (1)

imagekit/models.py

 ImageFile.MAXBLOCK = getattr(settings, 'PIL_IMAGEFILE_MAXBLOCK', 256 * 2 ** 10)
 
 # Choice tuples for specifying the crop origin.
-# These are provided for convienience.
+# These are provided for convenience.
 CROP_HORZ_CHOICES = (
     (0, _('left')),
     (1, _('center')),
         
     def admin_thumbnail_view(self):
         if not self._imgfield:
-            return 'None'
+            return None
         prop = getattr(self, self._ik.admin_thumbnail_spec, None)
         if prop is None:
             return 'An "%s" image spec has not been defined.' % \