Merge "Fix typo in keystoneclient"
This commit is contained in:
@@ -445,7 +445,7 @@ class AuthProtocol(object):
|
|||||||
|
|
||||||
# Token caching via memcache
|
# Token caching via memcache
|
||||||
self._cache = None
|
self._cache = None
|
||||||
self._cache_initialized = False # cache already initialzied?
|
self._cache_initialized = False # cache already initialized?
|
||||||
# memcache value treatment, ENCRYPT or MAC
|
# memcache value treatment, ENCRYPT or MAC
|
||||||
self._memcache_security_strategy = \
|
self._memcache_security_strategy = \
|
||||||
self._conf_get('memcache_security_strategy')
|
self._conf_get('memcache_security_strategy')
|
||||||
|
@@ -277,7 +277,7 @@ class OpenStackIdentityShell(object):
|
|||||||
|
|
||||||
def _find_actions(self, subparsers, actions_module):
|
def _find_actions(self, subparsers, actions_module):
|
||||||
for attr in (a for a in dir(actions_module) if a.startswith('do_')):
|
for attr in (a for a in dir(actions_module) if a.startswith('do_')):
|
||||||
# I prefer to be hypen-separated instead of underscores.
|
# I prefer to be hyphen-separated instead of underscores.
|
||||||
command = attr[3:].replace('_', '-')
|
command = attr[3:].replace('_', '-')
|
||||||
callback = getattr(actions_module, attr)
|
callback = getattr(actions_module, attr)
|
||||||
desc = callback.__doc__ or ''
|
desc = callback.__doc__ or ''
|
||||||
@@ -337,7 +337,7 @@ class OpenStackIdentityShell(object):
|
|||||||
args.os_password = getpass.getpass('OS Password: ')
|
args.os_password = getpass.getpass('OS Password: ')
|
||||||
except EOFError:
|
except EOFError:
|
||||||
pass
|
pass
|
||||||
# No password because we did't have a tty or the
|
# No password because we didn't have a tty or the
|
||||||
# user Ctl-D when prompted?
|
# user Ctl-D when prompted?
|
||||||
if not args.os_password:
|
if not args.os_password:
|
||||||
raise exc.CommandError(
|
raise exc.CommandError(
|
||||||
|
@@ -26,7 +26,7 @@ from keystoneclient.openstack.common import strutils
|
|||||||
# Decorator for cli-args
|
# Decorator for cli-args
|
||||||
def arg(*args, **kwargs):
|
def arg(*args, **kwargs):
|
||||||
def _decorator(func):
|
def _decorator(func):
|
||||||
# Because of the sematics of decorator composition if we just append
|
# Because of the semantics of decorator composition if we just append
|
||||||
# to the options list positional options will appear to be backwards.
|
# to the options list positional options will appear to be backwards.
|
||||||
func.__dict__.setdefault('arguments', []).insert(0, (args, kwargs))
|
func.__dict__.setdefault('arguments', []).insert(0, (args, kwargs))
|
||||||
return func
|
return func
|
||||||
|
Reference in New Issue
Block a user