From 1a3b03b383f204479c1a96f66dcc302e35681bb4 Mon Sep 17 00:00:00 2001
From: Mark <mark@steadman.io>
Date: Tue, 22 Sep 2015 21:59:04 +0100
Subject: [PATCH] Use get_current_site instead of Site model

---
 bambu_buffer/__init__.py |  6 +++---
 bambu_buffer/views.py    | 14 +++++++-------
 setup.py                 |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bambu_buffer/__init__.py b/bambu_buffer/__init__.py
index 36ee0ac..c84c75a 100644
--- a/bambu_buffer/__init__.py
+++ b/bambu_buffer/__init__.py
@@ -1,5 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.sites.models import Site
+from django.contrib.sites.shortcuts import get_current_site
 from django.db.models import Model
 from bambu_buffer.exceptions import *
 from bambu_buffer.models import BufferToken, BufferProfile, BufferedItem
@@ -8,7 +8,7 @@ from datetime import datetime, date
 from threading import Thread
 import requests
 
-__version__ = '3.1'
+__version__ = '3.2'
 default_app_config = 'bambu_buffer.apps.BufferConfig'
 
 class BufferThread(Thread):
@@ -39,7 +39,7 @@ def post(item, author, **kwargs):
         url = kwargs.get('url')
     elif isinstance(item, Model):
         url = u'http://%s%s' % (
-            Site.objects.get_current().domain, item.get_absolute_url()
+            get_current_site().domain, item.get_absolute_url()
         )
 
         content_type = ContentType.objects.get_for_model(item)
diff --git a/bambu_buffer/views.py b/bambu_buffer/views.py
index d6135c0..7d539e6 100644
--- a/bambu_buffer/views.py
+++ b/bambu_buffer/views.py
@@ -1,13 +1,13 @@
-from django.contrib.auth.decorators import login_required
-from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
+from bambu_buffer import settings, log
+from bambu_buffer.models import BufferToken, BufferProfile
 from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.contrib.sites.shortcuts import get_current_site
+from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.http import HttpResponseRedirect
 from django.template.response import TemplateResponse
 from django.utils.http import urlencode
-from bambu_buffer import settings, log
-from bambu_buffer.models import BufferToken, BufferProfile
 import requests
 
 @login_required
@@ -23,7 +23,7 @@ def auth(request):
                     'client_id': settings.CLIENT_ID,
                     'redirect_uri': 'http%s://%s%s' % (
                         request.is_secure() and 's' or '',
-                        Site.objects.get_current(),
+                        get_current_site().domain,
                         reverse('buffer_callback')
                     ),
                     'response_type': settings.RESPONSE_TYPE
@@ -41,7 +41,7 @@ def callback(request):
             'client_secret': settings.CLIENT_SECRET,
             'redirect_uri': 'http%s://%s%s' % (
                 request.is_secure() and 's' or '',
-                Site.objects.get_current(),
+                get_current_site().domain,
                 reverse('buffer_callback')
             ),
             'code': request.GET.get('code'),
diff --git a/setup.py b/setup.py
index 7cd86f0..00344c0 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from os import path
 
 setup(
     name = 'bambu-buffer',
-    version = '3.1',
+    version = '3.2',
     description = 'Post to Buffer and manage profile settings through a Django-powered site',
     author = 'Steadman',
     author_email = 'mark@steadman.io',