Revision 0308f3a7 snf-pithos-app/pithos/api/urls.py
b/snf-pithos-app/pithos/api/urls.py | ||
---|---|---|
34 | 34 |
from django.conf.urls.defaults import include, patterns |
35 | 35 |
|
36 | 36 |
# TODO: This only works when in this order. |
37 |
api_urlpatterns = patterns('pithos.api.functions', |
|
38 |
(r'^$', 'top_demux'), |
|
39 |
( |
|
40 |
r'^(?P<v_account>.+?)/(?P<v_container>.+?)/(?P<v_object>.+?)$', |
|
41 |
'object_demux'), |
|
42 |
(r'^(?P<v_account>.+?)/(?P<v_container>.+?)/?$', |
|
43 |
'container_demux'), |
|
44 |
(r'^(?P<v_account>.+?)/?$', 'account_demux') |
|
45 |
) |
|
37 |
api_urlpatterns = patterns( |
|
38 |
'pithos.api.functions', |
|
39 |
(r'^$', 'top_demux'), |
|
40 |
(r'^(?P<v_account>.+?)/(?P<v_container>.+?)/(?P<v_object>.+?)$', |
|
41 |
'object_demux'), |
|
42 |
(r'^(?P<v_account>.+?)/(?P<v_container>.+?)/?$', |
|
43 |
'container_demux'), |
|
44 |
(r'^(?P<v_account>.+?)/?$', 'account_demux')) |
|
46 | 45 |
|
47 |
urlpatterns = patterns('', |
|
48 |
(r'^v1(?:$|/)', include(api_urlpatterns)), |
|
49 |
(r'^v1\.0(?:$|/)', include(api_urlpatterns)), |
|
50 |
(r'^public/(?P<v_public>.+?)/?$', |
|
51 |
'pithos.api.public.public_demux'), |
|
52 |
(r'^login/?$', |
|
53 |
'pithos.api.delegate.delegate_to_login_service'), |
|
54 |
(r'^feedback/?$', |
|
55 |
'pithos.api.delegate.delegate_to_feedback_service'), |
|
56 |
) |
|
46 |
urlpatterns = patterns( |
|
47 |
'', |
|
48 |
(r'^v1(?:$|/)', include(api_urlpatterns)), |
|
49 |
(r'^v1\.0(?:$|/)', include(api_urlpatterns)), |
|
50 |
(r'^public/(?P<v_public>.+?)/?$', 'pithos.api.public.public_demux'), |
|
51 |
(r'^login/?$', 'pithos.api.delegate.delegate_to_login_service'), |
|
52 |
(r'^feedback/?$', 'pithos.api.delegate.delegate_to_feedback_service'), |
|
53 |
(r'^account/?$', 'pithos.api.delegate.account_username')) |
Also available in: Unified diff