From f765daf3360727c2baee0cfc9114d8728c1c4336 Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse@gmail.com>
Date: Mon, 19 Dec 2011 10:00:39 -0800
Subject: [PATCH] finish removing project_id

---
 keystoneclient/client.py      | 4 ++--
 keystoneclient/v2_0/client.py | 2 --
 tests/test_http.py            | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/keystoneclient/client.py b/keystoneclient/client.py
index 0c2b9cd21..bd5d30924 100644
--- a/keystoneclient/client.py
+++ b/keystoneclient/client.py
@@ -39,8 +39,8 @@ class HTTPClient(httplib2.Http):
     USER_AGENT = 'python-keystoneclient'
 
     def __init__(self, username=None, tenant_id=None, tenant_name=None,
-                 password=None, project_id=None, auth_url=None,
-                 region_name=None, timeout=None, endpoint=None, token=None):
+                 password=None, auth_url=None, region_name=None, timeout=None,
+                 endpoint=None, token=None):
         super(HTTPClient, self).__init__(timeout=timeout)
         self.username = username
         self.tenant_id = tenant_id
diff --git a/keystoneclient/v2_0/client.py b/keystoneclient/v2_0/client.py
index dda1a239d..02e936a7d 100644
--- a/keystoneclient/v2_0/client.py
+++ b/keystoneclient/v2_0/client.py
@@ -35,8 +35,6 @@ class Client(client.HTTPClient):
     :param string token: Token for authentication. (optional)
     :param string tenant_name: Tenant id. (optional)
     :param string tenant_id: Tenant name. (optional)
-    :param string project_id: Converted to tenant name. (deprecated -
-                              to be removed in essex)
     :param string auth_url: Keystone service endpoint for authorization.
     :param string region_name: Name of a region to select when choosing an
                                endpoint from the service catalog.
diff --git a/tests/test_http.py b/tests/test_http.py
index 96a38ee9c..4da7b5516 100644
--- a/tests/test_http.py
+++ b/tests/test_http.py
@@ -11,8 +11,8 @@ mock_request = mock.Mock(return_value=(fake_response, fake_body))
 
 
 def get_client():
-    cl = client.HTTPClient(username="username", password="apikey",
-                           project_id="project_id", auth_url="auth_test")
+    cl = client.HTTPClient(username="username", password="password",
+                           tenant_id="tenant", auth_url="auth_test")
     return cl