Merge remote-tracking branch 'origin/dev' into radosblocker

[pithos] / snf-pithos-app / pithos / api / delegate.py

diff --git a/snf-pithos-app/pithos/api/delegate.py b/snf-pithos-app/pithos/api/delegate.py
index e665723..185a3f6 100644 (file)
--- a/snf-pithos-app/pithos/api/delegate.py
+++ b/snf-pithos-app/pithos/api/delegate.py
@@ -1,18 +1,18 @@
 # Copyright 2011-2012 GRNET S.A. All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or
 # without modification, are permitted provided that the following
 # conditions are met:
-# 
+#
 #   1. Redistributions of source code must retain the above
 #      copyright notice, this list of conditions and the following
 #      disclaimer.
-# 
+#
 #   2. Redistributions in binary form must reproduce the above
 #      copyright notice, this list of conditions and the following
 #      disclaimer in the documentation and/or other materials
 #      provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
 # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -25,7 +25,7 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-# 
+#
 # The views and conclusions contained in the software and
 # documentation are those of the authors and should not be
 # interpreted as representing official policies, either expressed
@@ -46,12 +46,13 @@ from pithos.api.settings import AUTHENTICATION_URL, AUTHENTICATION_USERS, SERVIC
 
 logger = logging.getLogger(__name__)
 
+
 def delegate_to_login_service(request):
     url = AUTHENTICATION_URL
     users = AUTHENTICATION_USERS
     if users or not url:
         return HttpResponseNotFound()
-    
+
     p = urlparse(url)
     if request.is_secure():
         proto = 'https://'
@@ -61,21 +62,22 @@ def delegate_to_login_service(request):
     uri = proto + p.netloc + '/login?' + urlencode(params)
     return HttpResponseRedirect(uri)
 
+
 @csrf_exempt
 def delegate_to_feedback_service(request):
     url = AUTHENTICATION_URL
     users = AUTHENTICATION_USERS
     if users or not url:
         return HttpResponseNotFound()
-    
+
     p = urlparse(url)
     if request.is_secure():
         proto = 'https://'
     else:
         proto = 'http://'
-    
+
     uri = proto + p.netloc + '/im/service/api/v2.0/feedback'
-    headers = { 'X-Auth-Token' : SERVICE_TOKEN }
+    headers = {'X-Auth-Token': SERVICE_TOKEN}
     values = dict([(k, v) for k, v in request.POST.items()])
     data = urllib.urlencode(values)
     req = urllib2.Request(uri, data, headers)
@@ -87,4 +89,4 @@ def delegate_to_feedback_service(request):
     except urllib2.URLError, e:
         logger.exception(e)
         return HttpResponse(status=e.reason)
-    return HttpResponse()
\ No newline at end of file
+    return HttpResponse()