From 1407afdda1f89a4018b6b35d51c9d188a5c7b6e2 Mon Sep 17 00:00:00 2001
From: Konstantin Martini <k@tuxcode.org>
Date: Sat, 10 Jan 2015 02:26:53 +0100
Subject: [PATCH] tidied urls.py

---
 mate.sqlite3    | Bin 44032 -> 44032 bytes
 matecnt/urls.py |  19 +++++++++++--------
 matemat/urls.py |   2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/mate.sqlite3 b/mate.sqlite3
index d25b15c20ad5d817ad159a97e50fe6ed54695935..1b49a2a1938de3bd718a0bf167b9a70453d65cda 100644
GIT binary patch
delta 558
zcmah`J!lhg9R2_9-6f{^sIkVTSTv<V6im(C|DVexNNuQt4jqi(B-CI-YCbNBP5dYb
zxi+AsRjfDYAP%*Qo9BTJF2$jfh?^ZO=;or}(8<N7APx?$?}PUqud^j}wxoxLskAyg
zNhRmXN&m2X(1QfclnZ95K3$lpT{EYv^-^?@z{wt29I)T|&j(~|Fnqyxe8h$u4!p!f
zNLE-RLgo6bDR_$ag`lvZFqPYLt@fPYJAP7Fe}pO;7g{hZ?UI93sTT{^TS7}|{M)Pj
z?|E3nRFM_Qtfr6YDTAjo?)GGSA`nHB;TLwWjiwvw7T{4p<c-=l@7_lgOSbpkDG5uC
zbpeVDA4S~<%T0LzefZ22j50jJIn*$UH;xs?iDQ_edG)G!%WR9=^YvMyQZ;$I)-E*6
z8+u09E4*oVdLsM7TFkE6PeKZc3}5jM&(THEu`c515#&fqs;NX$O{m7--szN~8%dAb
zecX}vNwmUfMcQ<%4!QZKEh!XajDh9%P?le{&K_S#dz7igJGuWga(_G{8u}+`AuaFO
z?WP^ul^h^<b8TEX<f8_|Yg8~IeUg@?GxU?zso_|cNN7<X%k{^7LGt|>kkn(Un&n1T
a)5e665nL0e<Gm~6vEG^EUU&V)W$8E7Y?Z$N

delta 322
zcmV-I0lof!*aCpq0+1U4RFND*0aUSIEDIb16b1t=0c2`nZf9>_VPtJ-ZeMI~XBQU%
z12X}WA%hc>y9-GQ0|U?i1K<Pg1JJV(EW!gY4g&=M84&?$b#rueb2Kv#3jqZH4;2Ax
zGBY$X1`z@U02vnnYj0&?a&$B@H8L~*vJlKO5i=k#G&(RhIy5*gGBYzcI5D%`LnlBA
z7Xx<y1N#H@1KqO_gkb}bPzaNEhm8Xl1CEmih%d2$SOc?;i*W=G1PTM(00aX_00WW(
zNCR!N5RelCk&q_@Bm+$Wlg^?blWdci3<Lv&00ZFz!ULlNgtHM0bOW=5mw*Hc0{~J0
z08#;r0>+VnM6-;YbON)Cp*jHy4FCWD0RqMV0>-g{yaKbvqCN!_2mz!31GWQe10e#}
U0*eAa0r3H(v4M;Mv!tn90(9A3CIA2c

diff --git a/matecnt/urls.py b/matecnt/urls.py
index d851b1c..19f877c 100644
--- a/matecnt/urls.py
+++ b/matecnt/urls.py
@@ -1,16 +1,19 @@
 from django.conf.urls import patterns, include, url
+from matecnt import views as cnt_views
 
 urlpatterns = patterns('',
     # Examples:
     # url(r'^$', 'matemat.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
 
-    #(r'.*$', 'matecnt.views.overview'),
-    (r'index$', 'matecnt.views.index'),
-    (r'users/.*$', 'matecnt.views.users'),
-    (r'user/(?P<code>\w+)$', 'matecnt.views.user'),
-    (r'drinks/.*$', 'matecnt.views.drinks'),
-    (r'drink/(?P<code>\w+)$', 'matecnt.views.drink'),
-    (r'checkout', 'matecnt.views.checkout'),
-    (r'charge', 'matecnt.views.charge')
+    url(r'index$', cnt_views.index),
+
+    url(r'users/.*$', cnt_views.users),
+    url(r'user/(?P<code>\w+)$', cnt_views.user),
+
+    url(r'drinks/.*$', cnt_views.drinks),
+    url(r'drink/(?P<code>\w+)$', cnt_views.drink),
+
+    url(r'checkout', cnt_views.checkout),
+    url(r'charge', cnt_views.charge)
 )
diff --git a/matemat/urls.py b/matemat/urls.py
index b07ade5..04f1382 100644
--- a/matemat/urls.py
+++ b/matemat/urls.py
@@ -8,5 +8,5 @@ from matecnt import urls as matecnt_urls
 urlpatterns = patterns('',
     url(r'^mate/', include(matecnt_urls)),
     url(r'^admin/', include(admin.site.urls)),
-    (r'^.*$', RedirectView.as_view(url='/mate/index')),
+    url(r'^.*$', RedirectView.as_view(url='/mate/index')),
 )