From 6383f7f9f63e348a12adeff66a266ef796d98ded Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Fri, 17 Dec 2010 11:54:59 -0600
Subject: Some typo fixes

---
 nova/api/openstack/__init__.py              | 4 ++--
 nova/api/openstack/auth.py                  | 4 ++--
 nova/api/openstack/ratelimiting/__init__.py | 4 ++--
 nova/tests/api/openstack/__init__.py        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index e941694d9..e78080012 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -85,7 +85,7 @@ class AuthMiddleware(wsgi.Middleware):
 
     @webob.dec.wsgify
     def __call__(self, req):
-        if not self.auth_driver.has_authentication(req)
+        if not self.auth_driver.has_authentication(req):
             return self.auth_driver.authenticate(req)
 
         user = self.auth_driver.get_user_by_authentication(req)
@@ -108,7 +108,7 @@ class RateLimitingMiddleware(wsgi.Middleware):
         at the given host+port to keep rate counters.
         """
         super(RateLimitingMiddleware, self).__init__(application)
-        self._limiting_driver =
+        self._limiting_driver = \
             utils.import_class(FLAGS.os_api_ratelimiting)(service_host)
 
     @webob.dec.wsgify
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py
index da8ebcfcd..26cb50dca 100644
--- a/nova/api/openstack/auth.py
+++ b/nova/api/openstack/auth.py
@@ -28,10 +28,10 @@ class BasicApiAuthManager(object):
         super(BasicApiAuthManager, self).__init__()
 
     def has_authentication(self, req):
-        return 'X-Auth-Token' in req.headers:
+        return 'X-Auth-Token' in req.headers
 
     def get_user_by_authentication(self, req):
-        return self.auth_driver.authorize_token(req.headers["X-Auth-Token"])
+        return self.authorize_token(req.headers["X-Auth-Token"])
 
     def authenticate(self, req):
         # Unless the request is explicitly made against /<version>/ don't
diff --git a/nova/api/openstack/ratelimiting/__init__.py b/nova/api/openstack/ratelimiting/__init__.py
index d1da9afa7..2dc5ec32e 100644
--- a/nova/api/openstack/ratelimiting/__init__.py
+++ b/nova/api/openstack/ratelimiting/__init__.py
@@ -21,7 +21,7 @@ class BasicRateLimiting(object):
         if not service_host:
             #TODO(gundlach): These limits were based on limitations of Cloud
             #Servers.  We should revisit them in Nova.
-            self.limiter = ratelimiting.Limiter(limits={
+            self.limiter = Limiter(limits={
                     'DELETE': (100, ratelimiting.PER_MINUTE),
                     'PUT': (10, ratelimiting.PER_MINUTE),
                     'POST': (10, ratelimiting.PER_MINUTE),
@@ -29,7 +29,7 @@ class BasicRateLimiting(object):
                     'GET changes-since': (3, ratelimiting.PER_MINUTE),
                 })
         else:
-            self.limiter = ratelimiting.WSGIAppProxy(service_host)
+            self.limiter = WSGIAppProxy(service_host)
 
     def limited_request(self, req):
         """Rate limit the request.
diff --git a/nova/tests/api/openstack/__init__.py b/nova/tests/api/openstack/__init__.py
index 2e357febe..4e4dfe4fc 100644
--- a/nova/tests/api/openstack/__init__.py
+++ b/nova/tests/api/openstack/__init__.py
@@ -17,7 +17,7 @@
 
 import unittest
 
-from nova.api.openstack import limited
+from nova.api.openstack.common import limited
 from nova.api.openstack import RateLimitingMiddleware
 from nova.tests.api.fakes import APIStub
 from webob import Request
-- 
cgit