From 2b7308e8eab29ea1ef8a01d8450596aa4e534ef7 Mon Sep 17 00:00:00 2001 From: Juda Kaleta Date: Wed, 7 May 2014 22:53:46 +0200 Subject: [PATCH] Clean up imports, codestyle --- embed_video/backends.py | 2 +- embed_video/templatetags/embed_video_tags.py | 7 ++++--- embed_video/tests/tests_admin.py | 2 -- embed_video/tests/tests_fields.py | 1 + embed_video/tests/tests_tags.py | 2 +- embed_video/tests/tests_utils.py | 1 - 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/embed_video/backends.py b/embed_video/backends.py index 24b9369..0c6fc22 100644 --- a/embed_video/backends.py +++ b/embed_video/backends.py @@ -1,5 +1,4 @@ import re -from django.utils.datastructures import SortedDict import requests import json @@ -16,6 +15,7 @@ from django.conf import settings from django.template.loader import render_to_string from django.utils.functional import cached_property from django.utils.safestring import mark_safe +from django.utils.datastructures import SortedDict from .utils import import_by_path from .settings import EMBED_VIDEO_BACKENDS, EMBED_VIDEO_TIMEOUT diff --git a/embed_video/templatetags/embed_video_tags.py b/embed_video/templatetags/embed_video_tags.py index 2478a87..632f745 100644 --- a/embed_video/templatetags/embed_video_tags.py +++ b/embed_video/templatetags/embed_video_tags.py @@ -1,11 +1,12 @@ -from django.template import Library, Node, TemplateSyntaxError, Variable -from django.utils.safestring import mark_safe -from django.utils.encoding import smart_str import re import logging import requests from collections import defaultdict +from django.template import Library, Node, TemplateSyntaxError, Variable +from django.utils.safestring import mark_safe +from django.utils.encoding import smart_str + from ..backends import detect_backend, VideoBackend, \ VideoDoesntExistException, UnknownBackendException diff --git a/embed_video/tests/tests_admin.py b/embed_video/tests/tests_admin.py index b07dc2c..50b2c81 100644 --- a/embed_video/tests/tests_admin.py +++ b/embed_video/tests/tests_admin.py @@ -1,7 +1,5 @@ from unittest import TestCase -from django.forms import TextInput - from embed_video.admin import AdminVideoWidget, AdminVideoMixin from embed_video.backends import VimeoBackend from embed_video.fields import EmbedVideoField, EmbedVideoFormField diff --git a/embed_video/tests/tests_fields.py b/embed_video/tests/tests_fields.py index 74cd332..d6946c2 100644 --- a/embed_video/tests/tests_fields.py +++ b/embed_video/tests/tests_fields.py @@ -2,6 +2,7 @@ from mock import patch from unittest import TestCase from django.forms import ValidationError + from ..fields import EmbedVideoField, EmbedVideoFormField from ..backends import UnknownBackendException, UnknownIdException diff --git a/embed_video/tests/tests_tags.py b/embed_video/tests/tests_tags.py index 07cfcb2..36c7193 100644 --- a/embed_video/tests/tests_tags.py +++ b/embed_video/tests/tests_tags.py @@ -1,5 +1,4 @@ from unittest import TestCase -from django.test.client import RequestFactory from mock import Mock, patch import re @@ -15,6 +14,7 @@ from django.http import HttpRequest from django.template.base import Template from django.template.context import RequestContext from django.test.utils import override_settings +from django.test.client import RequestFactory from testfixtures import LogCapture from embed_video.templatetags.embed_video_tags import VideoNode diff --git a/embed_video/tests/tests_utils.py b/embed_video/tests/tests_utils.py index 85e8a31..3d3752d 100644 --- a/embed_video/tests/tests_utils.py +++ b/embed_video/tests/tests_utils.py @@ -1,4 +1,3 @@ -import sys from unittest import TestCase from django.core.exceptions import ImproperlyConfigured