diff options
| author | Ben Firshman | 2014-09-21 04:10:58 +0200 |
|---|---|---|
| committer | Ben Firshman | 2014-09-21 04:10:58 +0200 |
| commit | 576af8b1060d8a8881ef54b3b8bd7cdb6ecb0a47 (patch) | |
| tree | e3f413536a1ebdb870509282e5a31168c905b043 /src/shorturls/urls.py | |
| parent | 61f4de67ed9cfdf09df4cee83d3c3c88775a6bf4 (diff) | |
| parent | 0158a679083f030980e5463b2e7af906423cf6b0 (diff) | |
| download | django-shorturls-576af8b1060d8a8881ef54b3b8bd7cdb6ecb0a47.tar.bz2 | |
Merge pull request #9 from bfirsh/django-1.7
Django 1.7
Diffstat (limited to 'src/shorturls/urls.py')
| -rw-r--r-- | src/shorturls/urls.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shorturls/urls.py b/src/shorturls/urls.py index b81e24d..bc28d6b 100644 --- a/src/shorturls/urls.py +++ b/src/shorturls/urls.py @@ -1,9 +1,9 @@ from django.conf import settings -from django.conf.urls.defaults import * +from django.conf.urls import * urlpatterns = patterns('', url( regex = '^(?P<prefix>%s)(?P<tiny>\w+)$' % '|'.join(settings.SHORTEN_MODELS.keys()), view = 'shorturls.views.redirect', ), -)
\ No newline at end of file +) |