Skip to content

updated import for django.conf.urls.defaults deprecation #8

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.

Sign up for GitHub

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

Open
npinchot wants to merge 2 commits into
base: master
Choose a base branch
from
Open

updated import for django.conf.urls.defaults deprecation #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d908b04
updated import for django.conf.urls.defaults deprecation (removed in …
npinchot Nov 12, 2013
aec124b
Updated for Django 1.7
npinchot Mar 2, 2015
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
8 changes: 4 additions & 4 deletions locking/managers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ def point_of_timeout():
return datetime.datetime.now() - delta

class LockedManager(Manager):
def get_query_set(self):
def get_queryset(self):
timeout = point_of_timeout()
return super(LockedManager, self).get_query_set().filter(_locked_at__gt=timeout, _locked_at__isnull=False)
return super(LockedManager, self).get_queryset().filter(_locked_at__gt=timeout, _locked_at__isnull=False)

class UnlockedManager(Manager):
def get_query_set(self):
def get_queryset(self):
timeout = point_of_timeout()
return super(UnlockedManager, self).get_query_set().filter(Q(_locked_at__lte=timeout) | Q(_locked_at__isnull=True))
return super(UnlockedManager, self).get_queryset().filter(Q(_locked_at__lte=timeout) | Q(_locked_at__isnull=True))
4 changes: 2 additions & 2 deletions locking/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import *

urlpatterns = patterns('locking.views',
# verwijst naar een ajax-view voor het lockingmechanisme
Expand All @@ -10,4 +10,4 @@

urlpatterns += patterns('',
(r'jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': 'locking'}),
)
)