summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2012-12-28 11:58:17 -0600
committerChuck Short <chuck.short@canonical.com>2012-12-28 11:58:52 -0600
commit949fbbbed2e7cf3766f381d12712a3c2180cf79e (patch)
tree63251bc9da5535c729360cdc7ccecd232e8fad48
parenta0e06a8e96ccfeee1de0030da0a1a2ac9e6e5aad (diff)
Removed unused variables
Removed unused variables according to pyflakes. Change-Id: I25b808c58fa5a89a8641b168527320f6b575a974 Signed-off-by: Chuck Short <chuck.short@canonical.com>
-rw-r--r--keystone/common/sql/migrate_repo/versions/003_token_valid.py1
-rw-r--r--keystone/identity/backends/ldap/core.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/keystone/common/sql/migrate_repo/versions/003_token_valid.py b/keystone/common/sql/migrate_repo/versions/003_token_valid.py
index d45a7a87..f7d91ec9 100644
--- a/keystone/common/sql/migrate_repo/versions/003_token_valid.py
+++ b/keystone/common/sql/migrate_repo/versions/003_token_valid.py
@@ -27,7 +27,6 @@ def upgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine
- dialect = migrate_engine.url.get_dialect().name
token = Table('token', meta, autoload=True)
valid = Column("valid", Boolean(), ColumnDefault(True), nullable=False)
token.create_column(valid)
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py
index 709c8ecb..feeaa469 100644
--- a/keystone/identity/backends/ldap/core.py
+++ b/keystone/identity/backends/ldap/core.py
@@ -985,7 +985,7 @@ class RoleApi(common_ldap.BaseLdap, ApiShimMixin):
raise exception.ValidationError('Cannot change role ID')
try:
old_name = self.get_by_name(role['name'])
- raise exception.Conflict('Cannot duplicate name %s' % role['name'])
+ raise exception.Conflict('Cannot duplicate name %s' % old_name)
except exception.NotFound:
pass
try: