Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

middleware.py: Django 1.10 fix #2

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ python:
env:
- TOXENV="py27-django18"
- TOXENV="py27-django19"
- TOXENV="py27-django110"
- TOXENV="py34-django18"
- TOXENV="py34-django19"
- TOXENV="py34-django110"
install: pip install tox
script: tox -e $TOXENV
7 changes: 6 additions & 1 deletion online_status/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@
from online_status.conf import online_status_settings as config
from online_status.status import refresh_user, refresh_users_list, OnlineStatus

try:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change can't fix anything, because MiddlewareMixin is not used.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes thanks I have added it now

from django.utils.deprecation import MiddlewareMixin
except ImportError:
MiddlewareMixin = object

class OnlineStatusMiddleware(object):

class OnlineStatusMiddleware(MiddlewareMixin):
"""Cache OnlineStatus instance for an authenticated User"""

def process_request(self, request):
Expand Down
6 changes: 2 additions & 4 deletions online_status/views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.contrib.auth import get_user_model
from django.core.cache import cache
from django.http import HttpResponse, JsonResponse
from django.shortcuts import render_to_response
from django.shortcuts import render
from django.template.context import RequestContext
from online_status.utils import OnlineStatusJSONEncoder
from online_status.conf import online_status_settings as config
Expand All @@ -22,9 +22,7 @@ def example(request):
"""Example view where you can see templatetags in action"""
User = get_user_model()
user, created = User.objects.get_or_create(username='example')
return render_to_response('online_status/example.html',
{'example_user': user, },
context_instance=RequestContext(request))
return render(request, 'online_status/example.html', {'example_user': user, })


def test(request):
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = {py27,py34}-django1{8,9}
envlist = {py27,py34}-django1{8,9,10}

[testenv]
setenv =
Expand All @@ -11,3 +11,4 @@ basepython =
deps =
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11