Permalink
Browse files

Fixing imports from using conf to using setitngs.

  • Loading branch information...
1 parent 18cbcdb commit c90b4994c815c153aaf0da08c199e4e167ebab36 Randall Degges committed Mar 19, 2012
Showing with 5 additions and 5 deletions.
  1. +3 −3 django_twilio/client.py
  2. +2 −2 django_twilio/decorators.py
@@ -3,7 +3,7 @@
from twilio.rest import TwilioRestClient
-from django_twilio import conf
+from django_twilio import settings
# Create a single global ``twilio_client`` object that already makes use of
@@ -14,5 +14,5 @@
# NOTE: I'm explicitly defining the API version here so that if users forcibly
# install a later release of twilio-python that uses a different default API
# version--we'll still be OK.
-twilio_client = TwilioRestClient(conf.TWILIO_ACCOUNT_SID,
- conf.TWILIO_AUTH_TOKEN, version='2010-04-01')
+twilio_client = TwilioRestClient(settings.TWILIO_ACCOUNT_SID,
+ settings.TWILIO_AUTH_TOKEN, version='2010-04-01')
@@ -11,7 +11,7 @@
from twilio.twiml import Verb
from twilio.util import RequestValidator
-from django_twilio import conf
+from django_twilio import settings as django_twilio_settings
from django_twilio.utils import get_blacklisted_response
@@ -80,7 +80,7 @@ def decorator(request, *args, **kwargs):
# Validate the request
try:
- validator = RequestValidator(conf.TWILIO_AUTH_TOKEN)
+ validator = RequestValidator(django_twilio_settings.TWILIO_AUTH_TOKEN)
url = request.build_absolute_uri()
signature = request.META['HTTP_X_TWILIO_SIGNATURE']
except (AttributeError, KeyError):

0 comments on commit c90b499

Please sign in to comment.