fix django 1.9 deprecation warning

Author: thijstriemstra

encode/encoders.py

@@ -11,7 +11,10 @@
 import logging
 import subprocess
 
-from django.utils.module_loading import import_by_path
+try:
+    from django.utils.module_loading import import_string
+except ImportError:
+    from django.utils.module_loading import import_by_path as import_string
 
 from converter.ffmpeg import FFMpeg, FFMpegError, FFMpegConvertError
 
@@ -37,7 +40,7 @@ def get_encoder_class(import_path=None):
     :returns: The encoder class.
     :rtype: class
     """
-    return import_by_path(import_path or settings.ENCODE_DEFAULT_ENCODER_CLASS)
+    return import_string(import_path or settings.ENCODE_DEFAULT_ENCODER_CLASS)
 
 
 class BaseEncoder(object):

encode/tests/test_encoders.py

@@ -40,8 +40,14 @@ def test_none(self):
         """
         Retrieving a non-existing class raises an exception.
         """
-        self.assertRaises(ImproperlyConfigured, encoders.get_encoder_class,
-            'does.not.Exist')
+        module_path = 'does.not.Exist'
+        try:
+            # django >= 1.7
+            from django.utils.module_loading import import_string
+            exception = ImportError
+        except:
+            exception = ImproperlyConfigured
+        self.assertRaises(exception, encoders.get_encoder_class, module_path)
 
 
 class BasicEncoderTestCase(WebTest, DummyDataMixin):