Hopiu/django-avatar
1
0
Fork 0
mirror of https://github.com/jazzband/django-avatar.git synced 2026-05-12 01:23:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #58 from Kami/django_1.6_compatibility_fixes

Browse source 
Django 1.6 compatibility fixes
This commit is contained in:
Jannis Leidel 2013-07-29 04:00:09 -07:00
commit 01e2c17785
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
avatar/urls.py
View file

@ -1,4 +1,8 @@
from django.conf.urls.defaults import patterns, url
try:
from django.conf.urls import patterns, url
except ImportError:
# Django < 1.4
from django.conf.urls.defaults import patterns, url
urlpatterns = patterns(
'avatar.views',

6
tests/settings.py
View file

@ -1,4 +1,8 @@
from django.conf.urls.defaults import patterns, include, handler500, handler404
try:
from django.conf.urls import patterns, include, handler500, handler404
except ImportError:
# Django < 1.4
from django.conf.urls.defaults import patterns, include, handler500, handler404
DEFAULT_CHARSET = 'utf-8'