Clean up all imports

* Use relative imports within djrill package
* Standardize ordering
* Remove absolute_import (it's standard in all
  python versions we now support)
This commit is contained in:
medmunds
2015-11-30 17:33:08 -08:00
parent 632334b426
commit 8433e6d660
11 changed files with 35 additions and 33 deletions

View File

@@ -1,2 +1,3 @@
from djrill.exceptions import MandrillAPIError, NotSupportedByMandrillError
from ._version import __version__, VERSION
from .exceptions import MandrillAPIError, NotSupportedByMandrillError

View File

@@ -1,6 +1,5 @@
import json
from requests import HTTPError
import warnings
class MandrillAPIError(HTTPError):

View File

@@ -1,19 +1,18 @@
from __future__ import absolute_import
import json
import mimetypes
import requests
from base64 import b64encode
from datetime import date, datetime
from email.mime.base import MIMEBase
from email.utils import parseaddr
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.core.mail.backends.base import BaseEmailBackend
from django.core.mail.message import sanitize_address, DEFAULT_ATTACHMENT_MIME_TYPE
from djrill import MandrillAPIError, NotSupportedByMandrillError, __version__
from base64 import b64encode
from datetime import date, datetime
from email.mime.base import MIMEBase
from email.utils import parseaddr
import json
import mimetypes
import requests
from ..._version import __version__
from ...exceptions import MandrillAPIError, NotSupportedByMandrillError
def encode_date_for_mandrill(dt):

View File

@@ -1,7 +1,6 @@
from djrill.tests.test_mandrill_send import *
from djrill.tests.test_mandrill_send_template import *
from djrill.tests.test_mandrill_session_sharing import *
from djrill.tests.test_mandrill_subaccounts import *
from djrill.tests.test_mandrill_webhook import *
from djrill.tests.test_mandrill_integration import *
from .test_mandrill_integration import *
from .test_mandrill_send import *
from .test_mandrill_send_template import *
from .test_mandrill_session_sharing import *
from .test_mandrill_subaccounts import *
from .test_mandrill_webhook import *

View File

@@ -1,7 +1,7 @@
import json
from mock import patch
import requests
import six
from mock import patch
from django.test import TestCase
from django.test.utils import override_settings

View File

@@ -1,4 +1,5 @@
from __future__ import unicode_literals
import os
import unittest

View File

@@ -2,15 +2,15 @@
from __future__ import unicode_literals
import json
import os
import six
import unittest
from base64 import b64decode
from datetime import date, datetime, timedelta, tzinfo
from decimal import Decimal
from email.mime.base import MIMEBase
from email.mime.image import MIMEImage
import json
import os
import six
import unittest
from django.core import mail
from django.core.exceptions import ImproperlyConfigured
@@ -19,7 +19,8 @@ from django.test import TestCase
from django.test.utils import override_settings
from djrill import MandrillAPIError, NotSupportedByMandrillError
from djrill.tests.mock_backend import DjrillBackendMockAPITestCase
from .mock_backend import DjrillBackendMockAPITestCase
def decode_att(att):

View File

@@ -1,7 +1,8 @@
from django.core import mail
from djrill import MandrillAPIError
from djrill.tests.mock_backend import DjrillBackendMockAPITestCase
from .mock_backend import DjrillBackendMockAPITestCase
class DjrillMandrillSendTemplateTests(DjrillBackendMockAPITestCase):

View File

@@ -1,7 +1,7 @@
from django.core import mail
from django.test.utils import override_settings
from djrill.tests.mock_backend import DjrillBackendMockAPITestCase
from .mock_backend import DjrillBackendMockAPITestCase
class DjrillMandrillSubaccountTests(DjrillBackendMockAPITestCase):

View File

@@ -1,7 +1,7 @@
from base64 import b64encode
import hashlib
import hmac
import json
from base64 import b64encode
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured

View File

@@ -1,16 +1,17 @@
from base64 import b64encode
import hashlib
import hmac
import json
from base64 import b64encode
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.views.generic import View
from django.http import HttpResponse
from django.utils.decorators import method_decorator
from django.views.decorators.csrf import csrf_exempt
from django.views.generic import View
from djrill import signals
from djrill.compat import b
from .compat import b
from .signals import webhook_event
class DjrillWebhookSecretMixin(object):
@@ -77,7 +78,7 @@ class DjrillWebhookView(DjrillWebhookSecretMixin, DjrillWebhookSignatureMixin, V
return HttpResponse(status=400)
for event in data:
signals.webhook_event.send(
webhook_event.send(
sender=None, event_type=event['event'], data=event)
return HttpResponse()