|
|
@@ -42,7 +42,6 @@ from aws.s3.s3test_utils import get_test_bucket
|
|
|
from azure.conf import is_abfs_enabled, is_adls_enabled
|
|
|
from django.urls import reverse
|
|
|
from django.utils.encoding import smart_str
|
|
|
-from django.utils.translation import ugettext_lazy as _
|
|
|
from nose.plugins.attrib import attr
|
|
|
from nose.plugins.skip import SkipTest
|
|
|
from nose.tools import assert_true, assert_false, assert_equal, assert_not_equal, assert_raises,\
|
|
|
@@ -64,14 +63,13 @@ from filebrowser.views import snappy_installed
|
|
|
if sys.version_info[0] > 2:
|
|
|
from urllib.parse import unquote as urllib_unquote, urlparse
|
|
|
open_file = open
|
|
|
+ from django.utils.translation import gettext_lazy as _
|
|
|
+ from unittest.mock import patch, Mock
|
|
|
else:
|
|
|
from urllib import unquote as urllib_unquote
|
|
|
from urlparse import urlparse
|
|
|
open_file = file
|
|
|
-
|
|
|
-if sys.version_info[0] > 2:
|
|
|
- from unittest.mock import patch, Mock
|
|
|
-else:
|
|
|
+ from django.utils.translation import ugettext_lazy as _
|
|
|
from mock import patch, Mock
|
|
|
|
|
|
|