diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a79064..867056a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +* remove deprecation warnings + ### Removed * dropped support for python `2.7` and `3.5` diff --git a/test_proj/manage.py b/test_proj/manage.py index aa173cf..42cd55b 100755 --- a/test_proj/manage.py +++ b/test_proj/manage.py @@ -3,7 +3,7 @@ import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_proj.settings") sys.path.append(os.pardir) from django.core.management import execute_from_command_line diff --git a/test_proj/urls.py b/test_proj/urls.py index 0e56422..64574e9 100644 --- a/test_proj/urls.py +++ b/test_proj/urls.py @@ -1,9 +1,9 @@ -from django.conf.urls import url +from django.conf.urls import re_path from django.contrib import admin from .media_library.views import VideoFormView urlpatterns = [ - url(r'^admin/', admin.site.urls), - url(r'^', VideoFormView.as_view()), + re_path(r'^admin/', admin.site.urls), + re_path(r'^$', VideoFormView.as_view()), ] diff --git a/video_encoding/admin.py b/video_encoding/admin.py index faf149f..f0d7878 100644 --- a/video_encoding/admin.py +++ b/video_encoding/admin.py @@ -10,7 +10,7 @@ class FormatInline(admin.GenericTabularInline): extra = 0 max_num = 0 - def has_add_permission(self, *args): + def has_add_permission(self, *args, **kwargs): return False def has_delete_permission(self, *args, **kwargs): diff --git a/video_encoding/backends/__init__.py b/video_encoding/backends/__init__.py index 64c5a2e..028074a 100644 --- a/video_encoding/backends/__init__.py +++ b/video_encoding/backends/__init__.py @@ -2,10 +2,10 @@ from django.utils.module_loading import import_string from django.utils.translation import ugettext_lazy as _ -from ..config import settings - def get_backend_class(): + from ..config import settings + try: cls = import_string(settings.VIDEO_ENCODING_BACKEND) except ImportError as e: @@ -18,5 +18,7 @@ def get_backend_class(): def get_backend(): + from ..config import settings + cls = get_backend_class() return cls(**settings.VIDEO_ENCODING_BACKEND_PARAMS) diff --git a/video_encoding/fields.py b/video_encoding/fields.py index ea5bb78..98b4754 100644 --- a/video_encoding/fields.py +++ b/video_encoding/fields.py @@ -1,5 +1,5 @@ from django.db.models.fields.files import FieldFile, ImageField, ImageFileDescriptor -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from .backends import get_backend_class from .files import VideoFile diff --git a/video_encoding/models.py b/video_encoding/models.py index c0aabbc..ee88f16 100644 --- a/video_encoding/models.py +++ b/video_encoding/models.py @@ -3,7 +3,7 @@ from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.models import ContentType from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .fields import VideoField from .manager import FormatManager