Remove lib.smart_text / lib.force_text / lib.force_bytes

Author: Jaap Roes

imagekit/cachefiles/strategies.py

@@ -1,7 +1,6 @@
 import six
 
 from django.utils.functional import LazyObject
-from ..lib import force_text
 from ..utils import get_singleton
 
 

imagekit/files.py

@@ -2,7 +2,6 @@
 
 from django.core.files.base import File, ContentFile
 from django.utils.encoding import smart_str
-from .lib import smart_text
 from .utils import format_to_mimetype, extension_to_mimetype
 
 
@@ -102,8 +101,4 @@ def name(self):
         return self.file.name
 
     def __str__(self):
-        return smart_str(self.file.name or '')
-
-    def __unicode__(self):
-        # Python 2
-        return smart_text(self.file.name or '')
+        return str(self.file.name or '')

imagekit/lib.py

@@ -1,12 +1,8 @@
 from io import BytesIO as StringIO
 from logging import NullHandler
 
-from django.utils.encoding import force_bytes
-from django.utils.encoding import force_str as force_text
-from django.utils.encoding import smart_str as smart_text
 from PIL import (Image, ImageChops, ImageColor, ImageDraw, ImageEnhance,
                  ImageFile, ImageFilter, ImageStat)
 
 __all__ = ['Image', 'ImageColor', 'ImageChops', 'ImageEnhance', 'ImageFile',
-           'ImageFilter', 'ImageDraw', 'ImageStat', 'StringIO', 'NullHandler',
-           'force_text', 'force_bytes', 'smart_text']
+           'ImageFilter', 'ImageDraw', 'ImageStat', 'StringIO', 'NullHandler']

imagekit/templatetags/imagekit.py

@@ -1,11 +1,11 @@
 from django import template
+from django.utils.encoding import force_str
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 
 from ..compat import parse_bits
 from ..cachefiles import ImageCacheFile
 from ..registry import generator_registry
-from ..lib import force_text
 
 
 register = template.Library()
@@ -42,7 +42,7 @@ def __init__(self, variable_name, generator_id, generator_kwargs):
         self._variable_name = variable_name
 
     def get_variable_name(self, context):
-        return force_text(self._variable_name)
+        return force_str(self._variable_name)
 
     def render(self, context):
         variable_name = self.get_variable_name(context)
@@ -85,7 +85,7 @@ def __init__(self, variable_name, generator_id, dimensions, source, generator_kw
         self._generator_kwargs = generator_kwargs
 
     def get_variable_name(self, context):
-        return force_text(self._variable_name)
+        return force_str(self._variable_name)
 
     def render(self, context):
         variable_name = self.get_variable_name(context)

imagekit/utils.py

@@ -8,7 +8,7 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.core.files import File
 from pilkit.utils import *
-from .lib import NullHandler, force_bytes
+from .lib import NullHandler
 
 
 bad_memcached_key_chars = re.compile('[\u0000-\u001f\\s]+')
@@ -173,7 +173,7 @@ def sanitize_cache_key(key):
         # The also can't be > 250 chars long. Since we don't know what the
         # user's cache ``KEY_FUNCTION`` setting is like, we'll limit it to 200.
         if len(new_key) >= 200:
-            new_key = '%s:%s' % (new_key[:200-33], md5(force_bytes(key)).hexdigest())
+            new_key = '%s:%s' % (new_key[:200-33], md5(key.encode('utf-8')).hexdigest())
 
         key = new_key
     return key

tests/test_cachefiles.py

@@ -9,7 +9,6 @@
 from hashlib import md5
 from imagekit.cachefiles import ImageCacheFile, LazyImageCacheFile
 from imagekit.cachefiles.backends import Simple
-from imagekit.lib import force_bytes
 from .imagegenerators import TestSpec
 from .utils import (assert_file_is_truthy, assert_file_is_falsy,
                     DummyAsyncCacheFileBackend, get_unique_image_file,
@@ -104,7 +103,7 @@ def __init__(self, name):
     assert backend.get_key(file) == '%s%s:%s' % (
         settings.IMAGEKIT_CACHE_PREFIX,
         '1' * (200 - len(':') - 32 - len(settings.IMAGEKIT_CACHE_PREFIX)),
-        md5(force_bytes('%s%s-state' % (settings.IMAGEKIT_CACHE_PREFIX, filename))).hexdigest())
+        md5(('%s%s-state' % (settings.IMAGEKIT_CACHE_PREFIX, filename)).encode('utf-8')).hexdigest())
 
 
 def test_lazyfile_stringification():