diff options
| author | Zuul <zuul@review.openstack.org> | 2018-08-11 05:46:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-08-11 05:46:59 +0000 |
| commit | a870cffdf9eb292501796acabe8958b529d64708 (patch) | |
| tree | 5080d14262bbbd29ca69c666fddc96a30b8da8f9 /designateclient | |
| parent | 200f5192fdaf1abe982fadd1344f756c760a0414 (diff) | |
| parent | c0543004d06825c5b3d5f6f91b0ba2ad470fbf9c (diff) | |
| download | python-designateclient-a870cffdf9eb292501796acabe8958b529d64708.tar.gz | |
Merge "Check item is one of six.string_types not just str"
Diffstat (limited to 'designateclient')
| -rw-r--r-- | designateclient/v2/cli/common.py | 3 | ||||
| -rw-r--r-- | designateclient/v2/cli/zones.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/designateclient/v2/cli/common.py b/designateclient/v2/cli/common.py index ca66754..fb18df4 100644 --- a/designateclient/v2/cli/common.py +++ b/designateclient/v2/cli/common.py @@ -13,6 +13,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +import six def add_all_projects_option(parser): @@ -70,5 +71,5 @@ def set_all_common_headers(client, parsed_args): set_edit_managed(client, parsed_args.edit_managed) if parsed_args.sudo_project_id is not None and \ - isinstance(parsed_args.sudo_project_id, str): + isinstance(parsed_args.sudo_project_id, six.string_types): set_sudo_project_id(client, parsed_args.sudo_project_id) diff --git a/designateclient/v2/cli/zones.py b/designateclient/v2/cli/zones.py index 3782652..7511b0e 100644 --- a/designateclient/v2/cli/zones.py +++ b/designateclient/v2/cli/zones.py @@ -70,8 +70,6 @@ class ListZonesCommand(command.Lister): client = self.app.client_manager.dns common.set_all_common_headers(client, parsed_args) - common.set_all_common_headers(client, parsed_args) - criterion = {} if parsed_args.type is not None: criterion["type"] = parsed_args.type |