Skip to content

Commit

Permalink
fixed django version in travis from rc, auth views are now referenced…
Browse files Browse the repository at this point in the history
… by method instead of by string.
  • Loading branch information
dhedegaard committed Dec 6, 2015
1 parent 7890a9e commit 9c690e5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ matrix:
- python: pypy3
# Django 1.9 does not work on python 3.3, allow failure for now.
- python: 3.3
env: DJANGO_VERSION=1.9rc2
env: DJANGO_VERSION=1.9
exclude:
# Django 1.7 is not supported on python 3.5.
- python: 3.5
env: DJANGO_VERSION=1.7.11
env:
- DJANGO_VERSION=1.7.11
- DJANGO_VERSION=1.8.7
- DJANGO_VERSION=1.9rc2
- DJANGO_VERSION=1.9

install:
- pip install -q -r requirements.txt
Expand Down
5 changes: 3 additions & 2 deletions urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import unicode_literals

from django.conf.urls import patterns, url
from django.contrib.auth import views as auth_views

from youtube import views

Expand All @@ -20,11 +21,11 @@
url(r'^admin/(?P<channelid>\d+)/fetch/$',
views.channel_fetch, name='channel-fetch'),
url(r'^admin/add/$', views.channel_add, name='channel-add'),
url(r'^login/$', 'django.contrib.auth.views.login', {
url(r'^login/$', auth_views.login, {
'template_name': 'youtube/login.html',
'current_app': 'youtube',
}, name='login'),
url(r'^logout/$', 'django.contrib.auth.views.logout', {
url(r'^logout/$', auth_views.logout, {
'next_page': '/',
'current_app': 'youtube',
}, name='logout'),
Expand Down

0 comments on commit 9c690e5

Please sign in to comment.