diff options
| author | Josh Kearney <josh@jk0.org> | 2012-04-05 17:25:37 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2012-04-05 17:27:12 -0500 |
| commit | 5628eeaf76882d469b9acbbf1c8516982e819c7b (patch) | |
| tree | 7d2eddf06ac1bca76a42d4c804fc61859c4ecd6a | |
| parent | 7b8532908b869902dea1d9355c93c40fec258ef6 (diff) | |
| download | python-keystoneclient-5628eeaf76882d469b9acbbf1c8516982e819c7b.tar.gz | |
Removed unused imports and variables.
Also fixes AUTHORS file. Previous version was copied directly from python-novaclient.
Change-Id: I33654b6fe7197efbff300ebaf4892a8b53d85c54
| -rw-r--r-- | AUTHORS | 38 | ||||
| -rw-r--r-- | keystoneclient/client.py | 4 | ||||
| -rw-r--r-- | keystoneclient/v2_0/tenants.py | 2 |
3 files changed, 22 insertions, 22 deletions
@@ -1,21 +1,23 @@ -Andrey Brindeyev <abrindeyev@griddynamics.com> -Andy Smith <github@anarkystic.com> -Antony Messerli <amesserl@rackspace.com> -Brian Lamar <brian.lamar@rackspace.com> -Brian Waldon <brian.waldon@rackspace.com> -Chris Behrens <cbehrens+github@codestud.com> -Christopher MacGown <ignoti+github@gmail.com> -Ed Leafe <ed@leafe.com> -Eldar Nugaev <eldr@ya.ru> -Hengqing Hu <hudayou@hotmail.com> -Ilya Alekseyev <ilyaalekseyev@acm.org> -Johannes Erdfelt <johannes.erdfelt@rackspace.com> -Josh Kearney <josh@jk0.org> -Kevin L. Mitchell <kevin.mitchell@rackspace.com> -Kirill Shileev <kshileev@griddynamics.com> -Lvov Maxim <mlvov@mirantis.com> -Matt Dietz <matt.dietz@rackspace.com> -Sandy Walsh <sandy@darksecretsoftware.com> +Adam Gandelman <adamg@canonical.com> +Alan Pevec <apevec@redhat.com> +Anthony Young <sleepsonthefloor@gmail.com> +Brian Waldon <bcwaldon@gmail.com> +Dean Troyer <dtroyer@gmail.com> +Dolph Mathews <dolph.mathews@gmail.com> Gabriel Hurley <gabriel@strikeawe.com> +Ghe Rivero <ghe@debian.org> +Hengqing Hu <hudayou@hotmail.com> +Jenkins <jenkins@review.openstack.org> +Jesse Andrews <anotherjesse@gmail.com> Joe Heck <heckj@mac.com> +Josh Kearney <josh@jk0.org> +Ken Thomas <krt@yahoo-inc.com> +Monty Taylor <mordred@inaugust.com> +Thierry Carrez <thierry@openstack.org> +Tihomir Trifonov <t.trifonov@gmail.com> +Vishvananda Ishaya <vishvananda@gmail.com> Yaguang Tang <heut2008@gmail.com> +Zhongyue Luo <lzyeval@gmail.com> +Ziad Sawalha <github@highbridgellc.com> +jakedahn <jake@ansolabs.com> +termie <github@anarkystic.com> diff --git a/keystoneclient/client.py b/keystoneclient/client.py index 3042d09..337f048 100644 --- a/keystoneclient/client.py +++ b/keystoneclient/client.py @@ -11,8 +11,6 @@ OpenStack Client interface. Handles the REST calls and responses. import copy import logging import os -import time -import urllib import urlparse import httplib2 @@ -119,7 +117,7 @@ class HTTPClient(httplib2.Http): if body: try: body = json.loads(body) - except ValueError, e: + except ValueError: _logger.debug("Could not decode JSON from body: %s" % body) else: _logger.debug("No body was returned.") diff --git a/keystoneclient/v2_0/tenants.py b/keystoneclient/v2_0/tenants.py index 4ab1ee6..eb371b8 100644 --- a/keystoneclient/v2_0/tenants.py +++ b/keystoneclient/v2_0/tenants.py @@ -37,7 +37,7 @@ class Tenant(base.Resource): description=new_description, enabled=new_enabled) self = retval - except Exception, e: + except Exception: retval = None return retval |