Skip to content

Commit

Permalink
middleware support new style django 1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
nitely committed Jan 9, 2017
1 parent 5d55485 commit 46791d3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
9 changes: 7 additions & 2 deletions spirit/core/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,20 @@
from django.contrib.auth.views import redirect_to_login
from django.core.urlresolvers import resolve

try:
from django.utils.deprecation import MiddlewareMixin
except ImportError: # Django < 1.10
MiddlewareMixin = object

class XForwardedForMiddleware(object):

class XForwardedForMiddleware(MiddlewareMixin):

def process_request(self, request):
if not settings.DEBUG:
request.META['REMOTE_ADDR'] = request.META['HTTP_X_FORWARDED_FOR'].split(",")[-1].strip()


class PrivateForumMiddleware(object):
class PrivateForumMiddleware(MiddlewareMixin):

def process_request(self, request):
if not settings.ST_PRIVATE_FORUM:
Expand Down
13 changes: 9 additions & 4 deletions spirit/user/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
from django.contrib.auth import logout
from django.utils import timezone

try:
from django.utils.deprecation import MiddlewareMixin
except ImportError: # Django < 1.10
MiddlewareMixin = object

from .models import UserProfile


Expand All @@ -21,7 +26,7 @@
logger = logging.getLogger('django')


class TimezoneMiddleware(object):
class TimezoneMiddleware(MiddlewareMixin):

def process_request(self, request):
if request.user.is_authenticated():
Expand All @@ -36,7 +41,7 @@ def process_request(self, request):
timezone.deactivate()


class LastIPMiddleware(object):
class LastIPMiddleware(MiddlewareMixin):

def process_request(self, request):
if not request.user.is_authenticated():
Expand All @@ -52,7 +57,7 @@ def process_request(self, request):
.update(last_ip=last_ip))


class LastSeenMiddleware(object):
class LastSeenMiddleware(MiddlewareMixin):

def process_request(self, request):
if not request.user.is_authenticated():
Expand All @@ -69,7 +74,7 @@ def process_request(self, request):
.update(last_seen=timezone.now()))


class ActiveUserMiddleware(object):
class ActiveUserMiddleware(MiddlewareMixin):

def process_request(self, request):
if not request.user.is_authenticated():
Expand Down

0 comments on commit 46791d3

Please sign in to comment.