Revision 63de12cf snf-pithos-app/pithos/api/urls.py

b/snf-pithos-app/pithos/api/urls.py
40 40 
    BASE_PATH, ASTAKOS_BASE_URL, BASE_ASTAKOS_PROXY_PATH,
41 41 
    ASTAKOS_ACCOUNTS_PREFIX, PROXY_USER_SERVICES,
42 42 
    PITHOS_PREFIX, PUBLIC_PREFIX, UI_PREFIX)
43 
from urlparse import urlparse
44 43 

  		





  45
  44
  
    

  		





  46
  45
  
    
# TODO: This only works when in this order.


  		





  ......




  53
  52
  
    
    'container_demux'),


  		





  54
  53
  
    
    (r'^(?P<v_account>.+?)/?$', 'account_demux'))


  		





  55
  54
  
    

  		





  
  55
  
    
pithos_view_patterns = patterns(


  		





  
  56
  
    
    'pithos.api.views',


  		





  
  57
  
    
    (r'^(?P<v_account>.+?)/(?P<v_container>.+?)/(?P<v_object>.+?)$',


  		





  
  58
  
    
    'object_read'))


  		





  
  59
  
    

  		





  56
  60
  
    
pithos_patterns = patterns(


  		





  57
  61
  
    
    '',


  		





  58
  62
  
    
    (r'{0}v1/'.format(prefix_pattern(PITHOS_PREFIX)),


  		





  59
  63
  
    
        include(pithos_api_patterns)),


  		





  60
  64
  
    
    (r'{0}(?P<v_public>.+?)/?$'.format(prefix_pattern(PUBLIC_PREFIX)),


  		





  61
  
  
    
        'pithos.api.public.public_demux'))


  		





  
  65
  
    
        'pithos.api.public.public_demux'),


  		





  
  66
  
    
    (r'{0}v1/'.format(prefix_pattern(UI_PREFIX)),


  		





  
  67
  
    
        include(pithos_view_patterns)))


  		





  62
  68
  
    

  		





  63
  69
  
    
urlpatterns = patterns(


  		





  64
  70
  
    
    '',


  		












Also available in:
  Unified diff