Commit 81d8c4c5 authored by Stavros Sachtouris's avatar Stavros Sachtouris
Browse files

Replace "has_key" with "in" to be more pythonic

parent 77139a38
#!/usr/bin/env python #!/usr/bin/env python
# from optparse import OptionParser
import json import json
import uuid import uuid
...@@ -15,7 +14,6 @@ from snfOCCI.network import ( ...@@ -15,7 +14,6 @@ from snfOCCI.network import (
from kamaki.clients.cyclades import CycladesNetworkClient from kamaki.clients.cyclades import CycladesNetworkClient
from snfOCCI.extensions import snf_addons from snfOCCI.extensions import snf_addons
# from kamaki.clients.compute import ComputeClient
from kamaki.clients.cyclades import CycladesComputeClient as ComputeClient from kamaki.clients.cyclades import CycladesComputeClient as ComputeClient
from kamaki.clients.cyclades import CycladesClient from kamaki.clients.cyclades import CycladesClient
from kamaki.clients import astakos from kamaki.clients import astakos
...@@ -34,32 +32,6 @@ from wsgiref.validate import validator ...@@ -34,32 +32,6 @@ from wsgiref.validate import validator
from webob import Request from webob import Request
# def parse_arguments(args):
# kw = dict(
# usage="%prog [options]",
# description="OCCI interface to synnefo API",
# )
# parser = OptionParser(**kw)
# parser.disable_interspersed_args()
# parser.add_option(
# "--enable_voms",
# action="store_true", dest="enable_voms", default=False,
# help="Enable voms authorization")
# parser.add_option(
# "--voms_db",
# action="store", type="string", dest="voms_db",
# help="Path to sqlite database file")
# (opts, args) = parser.parse_args(args)
# if opts.enable_voms and not opts.voms_db:
# print "--voms_db option required"
# parser.print_help()
# return (opts, args)
class MyAPP(wsgi.Application): class MyAPP(wsgi.Application):
"""An OCCI WSGI application""" """An OCCI WSGI application"""
...@@ -285,7 +257,7 @@ class MyAPP(wsgi.Application): ...@@ -285,7 +257,7 @@ class MyAPP(wsgi.Application):
print "SNF_OCCI application has been called!" print "SNF_OCCI application has been called!"
req = Request(environ) req = Request(environ)
if not req.environ.has_key('HTTP_X_AUTH_TOKEN'): if 'HTTP_X_AUTH_TOKEN' not in req.environ:
print "An authentication token has NOT been provided!" print "An authentication token has NOT been provided!"
status = '401 Not Authorized' status = '401 Not Authorized'
headers = [ headers = [
...@@ -422,7 +394,7 @@ def tenant_application(env, start_response): ...@@ -422,7 +394,7 @@ def tenant_application(env, start_response):
"""/v2.0/tennants""" """/v2.0/tennants"""
print "In /v2.0/tennants" print "In /v2.0/tennants"
req = Request(env) req = Request(env)
if req.environ.has_key('HTTP_X_AUTH_TOKEN'): if 'HTTP_X_AUTH_TOKEN' in req.environ:
env['HTTP_AUTH_TOKEN'] = req.environ['HTTP_X_AUTH_TOKEN'] env['HTTP_AUTH_TOKEN'] = req.environ['HTTP_X_AUTH_TOKEN']
else: else:
raise HTTPError(404, "Unauthorized access") raise HTTPError(404, "Unauthorized access")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment