forked from extern/django-helpdesk
Remove six package and dependent code
This commit is contained in:
parent
95e14b2ee7
commit
2c8c187e36
@ -18,7 +18,6 @@ import itertools
|
|||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
from shutil import rmtree
|
from shutil import rmtree
|
||||||
import six
|
|
||||||
import sys
|
import sys
|
||||||
from tempfile import mkdtemp
|
from tempfile import mkdtemp
|
||||||
import typing
|
import typing
|
||||||
@ -376,7 +375,7 @@ class GetEmailParametricTemplate(object):
|
|||||||
if self.method == 'local':
|
if self.method == 'local':
|
||||||
with mock.patch('os.listdir') as mocked_listdir, \
|
with mock.patch('os.listdir') as mocked_listdir, \
|
||||||
mock.patch('helpdesk.email.isfile') as mocked_isfile, \
|
mock.patch('helpdesk.email.isfile') as mocked_isfile, \
|
||||||
mock.patch('builtins.open' if six.PY3 else '__builtin__.open', mock.mock_open(read_data=test_email)), \
|
mock.patch('builtins.open', mock.mock_open(read_data=test_email)), \
|
||||||
mock.patch('os.unlink'):
|
mock.patch('os.unlink'):
|
||||||
mocked_isfile.return_value = True
|
mocked_isfile.return_value = True
|
||||||
mocked_listdir.return_value = ['filename1', 'filename2']
|
mocked_listdir.return_value = ['filename1', 'filename2']
|
||||||
|
@ -8,7 +8,6 @@ beautifulsoup4
|
|||||||
lxml
|
lxml
|
||||||
simplejson
|
simplejson
|
||||||
pytz
|
pytz
|
||||||
six
|
|
||||||
pinax_teams
|
pinax_teams
|
||||||
djangorestframework
|
djangorestframework
|
||||||
django-model-utils
|
django-model-utils
|
||||||
|
Loading…
Reference in New Issue
Block a user