diff options
| author | Alen Mujezinovic | 2012-02-09 11:13:42 +0000 |
|---|---|---|
| committer | Alen Mujezinovic | 2012-02-09 11:13:42 +0000 |
| commit | add5f32e8a9ba530591c23b8123f36468595fd88 (patch) | |
| tree | 7d4794e487614c9928d5f31420dfb423350cbff6 /examples/urls.py | |
| parent | dd680d7a0ae997f2e562db383f23b56624e7ea98 (diff) | |
| parent | c5691cca0e5b61b6cf866f5b8085f950e4637f5a (diff) | |
| download | django-rest-framework-add5f32e8a9ba530591c23b8123f36468595fd88.tar.bz2 | |
Merge remote branch 'tomchristie/master'
Diffstat (limited to 'examples/urls.py')
| -rw-r--r-- | examples/urls.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/examples/urls.py b/examples/urls.py index 08d97a14..33297b55 100644 --- a/examples/urls.py +++ b/examples/urls.py @@ -1,6 +1,10 @@ -from django.conf.urls.defaults import patterns, include, url -from django.conf import settings +from django.conf.urls.defaults import patterns, include from sandbox.views import Sandbox +try: + from django.contrib.staticfiles.urls import staticfiles_urlpatterns +except ImportError: # Django <= 1.2 + from staticfiles.urls import staticfiles_urlpatterns + urlpatterns = patterns('', (r'^$', Sandbox.as_view()), @@ -15,3 +19,4 @@ urlpatterns = patterns('', (r'^', include('djangorestframework.urls')), ) +urlpatterns += staticfiles_urlpatterns() |