← Back to branch summary

~libravatar/libravatar/master

« back to all changes in this revision

Viewing changes to libravatar/urls.py

  • Committer: Francois Marier
  • Date: 2016-01-19 05:15:53 UTC
  • mfrom: (938.1.35)
  • Revision ID: git-v1:37eed3b35265f0401db473e2ceedea9859e86703
Merge branch 'django1.7'

Show diffs side-by-side

added added

removed removed

Lines of Context:
libravatar/urls.py
1
 
# Copyright (C) 2010, 2011, 2013  Francois Marier <francois@libravatar.org>
 
1
# Copyright (C) 2010, 2011, 2013, 2016  Francois Marier <francois@libravatar.org>
2
2
#
3
3
# This file is part of Libravatar
4
4
#
15
15
# You should have received a copy of the GNU Affero General Public License
16
16
# along with Libravatar.  If not, see <http://www.gnu.org/licenses/>.
17
17
 
18
 
# pylint: disable=W0401,W0614
19
 
from django.conf.urls.defaults import patterns, include, handler404, handler500
 
18
from django.conf.urls import url, patterns, include, handler404, handler500
20
19
 
21
20
handler404  # make pyflakes happy, pylint: disable=W0104
22
21
handler500  # make pyflakes happy, pylint: disable=W0104
23
22
 
 
23
# pylint: disable=invalid-name
24
24
urlpatterns = patterns('',
25
 
    (r'^account/', include('libravatar.account.urls')),
26
 
 
27
 
    (r'^openid/', include('django_openid_auth.urls')),
28
 
 
29
 
    (r'^tools/', include('libravatar.tools.urls')),
30
 
 
31
 
    (r'^$', 'libravatar.public.views.home'),
32
 
    (r'^resize/', 'libravatar.public.views.resize'),
33
 
    (r'^resolve/', 'libravatar.public.views.resolve'),
34
 
)
 
25
                       url(r'^account/', include('libravatar.account.urls')),
 
26
 
 
27
                       url(r'^openid/', include('django_openid_auth.urls')),
 
28
 
 
29
                       url(r'^tools/', include('libravatar.tools.urls')),
 
30
 
 
31
                       url(r'^$', 'libravatar.public.views.home'),
 
32
                       url(r'^resize/', 'libravatar.public.views.resize'),
 
33
                       url(r'^resolve/', 'libravatar.public.views.resolve'),
 
34
                      )