diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-03 16:19:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-03 16:19:10 +0000 |
| commit | 4b90bc5c314fa52ece212451fbfec7ba7eced3b1 (patch) | |
| tree | 785a0f9a031b3da490d1ae2351a4bf561be8fa2a /keystoneclient | |
| parent | 795d253d4ae5d9fdf4aea8ba03e2b73a24ded2a7 (diff) | |
| parent | 6f27af4a0cdbde42b1566ecabaf667c26b089dc3 (diff) | |
| download | python-keystoneclient-0.2.5.tar.gz | |
Merge "Fix unused imports(flake8 F401, F999)"0.2.5
Diffstat (limited to 'keystoneclient')
| -rw-r--r-- | keystoneclient/client.py | 4 | ||||
| -rw-r--r-- | keystoneclient/common/cms.py | 2 | ||||
| -rw-r--r-- | keystoneclient/v2_0/__init__.py | 1 | ||||
| -rw-r--r-- | keystoneclient/v2_0/client.py | 16 | ||||
| -rw-r--r-- | keystoneclient/v3/__init__.py | 1 | ||||
| -rw-r--r-- | keystoneclient/v3/client.py | 7 |
6 files changed, 17 insertions, 14 deletions
diff --git a/keystoneclient/client.py b/keystoneclient/client.py index 8e5e2bd..5b2f125 100644 --- a/keystoneclient/client.py +++ b/keystoneclient/client.py @@ -35,8 +35,8 @@ _logger = logging.getLogger(__name__) def try_import_keyring(): try: - import keyring - import pickle + import keyring # noqa + import pickle # noqa return True except ImportError: if (hasattr(sys.stderr, 'isatty') and sys.stderr.isatty()): diff --git a/keystoneclient/common/cms.py b/keystoneclient/common/cms.py index f13264d..48b991a 100644 --- a/keystoneclient/common/cms.py +++ b/keystoneclient/common/cms.py @@ -21,7 +21,7 @@ def _ensure_subprocess(): else: import subprocess except ImportError: - import subprocess + import subprocess # noqa def cms_verify(formatted, signing_cert_file_name, ca_file_name): diff --git a/keystoneclient/v2_0/__init__.py b/keystoneclient/v2_0/__init__.py index 44ad28e..00ff0c1 100644 --- a/keystoneclient/v2_0/__init__.py +++ b/keystoneclient/v2_0/__init__.py @@ -1 +1,2 @@ +# flake8: noqa from keystoneclient.v2_0.client import Client diff --git a/keystoneclient/v2_0/client.py b/keystoneclient/v2_0/client.py index 03cb8f2..788bfa7 100644 --- a/keystoneclient/v2_0/client.py +++ b/keystoneclient/v2_0/client.py @@ -80,9 +80,9 @@ class Client(client.HTTPClient): >>> from keystoneclient.v2_0 import client >>> keystone = client.Client(username=USER, - password=PASS, - tenant_name=TENANT_NAME, - auth_url=KEYSTONE_URL) + ... password=PASS, + ... tenant_name=TENANT_NAME, + ... auth_url=KEYSTONE_URL) >>> keystone.tenants.list() ... >>> user = keystone.users.get(USER_ID) @@ -95,9 +95,9 @@ class Client(client.HTTPClient): >>> from keystoneclient.v2_0 import client >>> keystone = client.Client(username=USER, - password=PASS, - tenant_name=TENANT_NAME, - auth_url=KEYSTONE_URL) + ... password=PASS, + ... tenant_name=TENANT_NAME, + ... auth_url=KEYSTONE_URL) >>> auth_ref = keystone.auth_ref >>> # pickle or whatever you like here >>> new_client = client.Client(auth_ref=auth_ref) @@ -111,8 +111,8 @@ class Client(client.HTTPClient): >>> from keystoneclient.v2_0 import client >>> admin_client = client.Client( - token='12345secret7890', - endpoint='http://localhost:35357/v2.0') + ... token='12345secret7890', + ... endpoint='http://localhost:35357/v2.0') >>> keystone.tenants.list() """ diff --git a/keystoneclient/v3/__init__.py b/keystoneclient/v3/__init__.py index feb2536..82919ad 100644 --- a/keystoneclient/v3/__init__.py +++ b/keystoneclient/v3/__init__.py @@ -1 +1,2 @@ +# flake8: noqa from keystoneclient.v3.client import Client diff --git a/keystoneclient/v3/client.py b/keystoneclient/v3/client.py index f8d860c..c0b613e 100644 --- a/keystoneclient/v3/client.py +++ b/keystoneclient/v3/client.py @@ -52,9 +52,10 @@ class Client(client.Client): >>> from keystoneclient.v3 import client >>> keystone = client.Client(username=USER, - password=PASS, - tenant_name=TENANT_NAME, - auth_url=KEYSTONE_URL) + ... password=PASS, + ... tenant_name=TENANT_NAME, + ... auth_url=KEYSTONE_URL) + ... >>> keystone.tenants.list() ... >>> user = keystone.users.get(USER_ID) |