diff options
| -rw-r--r-- | keystoneclient/tests/functional/base.py | 12 | ||||
| -rw-r--r-- | keystoneclient/v3/regions.py | 34 | ||||
| -rw-r--r-- | tox.ini | 3 |
3 files changed, 23 insertions, 26 deletions
diff --git a/keystoneclient/tests/functional/base.py b/keystoneclient/tests/functional/base.py index c0eeae1..743cb50 100644 --- a/keystoneclient/tests/functional/base.py +++ b/keystoneclient/tests/functional/base.py @@ -22,13 +22,13 @@ OPENSTACK_CLOUDS = ('functional_admin', 'devstack-admin', 'envvars') def get_client(version): """Create a keystoneclient instance to run functional tests. - The client is instantiated via os-client-config either based on a - clouds.yaml config file or from the environment variables. + The client is instantiated via os-client-config either based on a + clouds.yaml config file or from the environment variables. - First, look for a 'functional_admin' cloud, as this is a cloud that the - user may have defined for functional testing with admin credentials. If - that is not found, check for the 'devstack-admin' cloud. Finally, fall - back to looking for environment variables. + First, look for a 'functional_admin' cloud, as this is a cloud that the + user may have defined for functional testing with admin credentials. If + that is not found, check for the 'devstack-admin' cloud. Finally, fall + back to looking for environment variables. """ for cloud in OPENSTACK_CLOUDS: diff --git a/keystoneclient/v3/regions.py b/keystoneclient/v3/regions.py index 10a9b23..f9b621f 100644 --- a/keystoneclient/v3/regions.py +++ b/keystoneclient/v3/regions.py @@ -20,10 +20,10 @@ class Region(base.Resource): * id: a string that identifies the region. * description: a string that describes the region. Optional. * parent_region_id: string that is the id field for a pre-existing - region in the backend. Allows for hierarchical region - organization + region in the backend. Allows for hierarchical + region organization. * enabled: determines whether the endpoint appears in the catalog. - Defaults to True + Defaults to True """ pass @@ -38,14 +38,13 @@ class RegionManager(base.CrudManager): parent_region=None, **kwargs): """Create a Catalog region. - :param id: a string that identifies the region. If not specified - a unique identifier will be assigned to the region. - :param description: a string that describes the region. - :param parent_region: string that is the id field for a - pre-existing region in the backend. Allows for hierarchical - region organization. - :param enabled: determines whether the endpoint appears in the - catalog. + :param id: a string that identifies the region. If not specified a + unique identifier will be assigned to the region. + :param description: a string that describes the region. + :param parent_region: string that is the id field for a pre-existing + region in the backend. Allows for hierarchical + region organization. + :param enabled: determines whether the endpoint appears in the catalog. """ return super(RegionManager, self).create( @@ -69,13 +68,12 @@ class RegionManager(base.CrudManager): parent_region=None, **kwargs): """Update a Catalog region. - :param region: a string that identifies the region. - :param description: a string that describes the region. - :param parent_region: string that is the id field for a - pre-existing region in the backend. Allows for hierarchical - region organization. - :param enabled: determines whether the endpoint appears in the - catalog. + :param region: a string that identifies the region. + :param description: a string that describes the region. + :param parent_region: string that is the id field for a pre-existing + region in the backend. Allows for hierarchical + region organization. + :param enabled: determines whether the endpoint appears in the catalog. """ return super(RegionManager, self).update( @@ -52,8 +52,7 @@ passenv = OS_* # D204: 1 blank required after class docstring # D205: Blank line required between one-line summary and description. # D207: Docstring is under-indented -# D208: Docstring is over-indented -ignore = D100,D101,D102,D103,D104,D105,D200,D202,D203,D204,D205,D207,D208 +ignore = D100,D101,D102,D103,D104,D105,D200,D202,D203,D204,D205,D207 show-source = True exclude = .venv,.tox,dist,doc,*egg,build,*openstack/common* |