|
@@ -1,10 +1,12 @@
|
|
|
-from django.conf.urls import patterns, include, url
|
|
|
+from django.conf.urls import url
|
|
|
+
|
|
|
+from world.views import plaintext, json, db, dbs, fortunes, update
|
|
|
|
|
|
# Uncomment the next two lines to enable the admin:
|
|
|
# from django.contrib import admin
|
|
|
# admin.autodiscover()
|
|
|
|
|
|
-urlpatterns = patterns('',
|
|
|
+urlpatterns = [
|
|
|
# Examples:
|
|
|
# url(r'^$', 'hello.views.home', name='home'),
|
|
|
# url(r'^hello/', include('hello.foo.urls')),
|
|
@@ -14,10 +16,10 @@ urlpatterns = patterns('',
|
|
|
|
|
|
# Uncomment the next line to enable the admin:
|
|
|
# url(r'^admin/', include(admin.site.urls)),
|
|
|
- url(r'^plaintext$', 'world.views.plaintext'),
|
|
|
- url(r'^json$', 'world.views.json'),
|
|
|
- url(r'^db$', 'world.views.db'),
|
|
|
- url(r'^dbs$', 'world.views.dbs'),
|
|
|
- url(r'^fortunes$', 'world.views.fortunes'),
|
|
|
- url(r'^update$', 'world.views.update'),
|
|
|
-)
|
|
|
+ url(r'^plaintext$', plaintext),
|
|
|
+ url(r'^json$', json),
|
|
|
+ url(r'^db$', db),
|
|
|
+ url(r'^dbs$', dbs),
|
|
|
+ url(r'^fortunes$', fortunes),
|
|
|
+ url(r'^update$', update),
|
|
|
+]
|