django-openid-auth

Merge lp:~fgallina/django-openid-auth/url-fixes into lp:~django-openid-auth/django-openid-auth/trunk

  1. url-fixes
  2. Merge into trunk
Proposed by Fabián Ezequiel Gallina
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 108
Merged at revision: 108
Proposed branch: lp:~fgallina/django-openid-auth/url-fixes
Merge into: lp:~django-openid-auth/django-openid-auth/trunk
Diff against target: 25 lines (+2/-2)
2 files modified
django_openid_auth/tests/urls.py (+1/-1)
django_openid_auth/urls.py (+1/-1)
To merge this branch: bzr merge lp:~fgallina/django-openid-auth/url-fixes
Reviewer Review Type Date Requested Status
Ricardo Kirkner Approve
Review via email: mp+216762@code.launchpad.net

Commit message

Fix django.conf.urls imports

django.conf.urls.defaults was removed in Django 1.6 and now all the
utilities contained there moved to django.conf.urls

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'django_openid_auth/tests/urls.py'
2--- django_openid_auth/tests/urls.py 2013-03-13 21:55:40 +0000
3+++ django_openid_auth/tests/urls.py 2014-04-22 18:10:22 +0000
4@@ -27,7 +27,7 @@
5 # POSSIBILITY OF SUCH DAMAGE.
6
7 from django.http import HttpResponse
8-from django.conf.urls.defaults import *
9+from django.conf.urls import *
10
11
12 def get_user(request):
13
14=== modified file 'django_openid_auth/urls.py'
15--- django_openid_auth/urls.py 2013-03-13 21:55:40 +0000
16+++ django_openid_auth/urls.py 2014-04-22 18:10:22 +0000
17@@ -27,7 +27,7 @@
18 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
19 # POSSIBILITY OF SUCH DAMAGE.
20
21-from django.conf.urls.defaults import *
22+from django.conf.urls import *
23
24 urlpatterns = patterns('django_openid_auth.views',
25 url(r'^login/$', 'login_begin', name='openid-login'),

Subscribers

People subscribed via source and target branches